From: Michael Büsch <mb@bu3sch.de>
Date: Thu, 19 Aug 2010 11:56:38 +0000 (+0000)
Subject: qt4: Add qws- prefix to QWS specific files.
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ab6a5afcf0106706ea5d64b72de8decff73e5967

qt4: Add qws- prefix to QWS specific files.
No functional change. This just moves the files.


SVN-Revision: 22716
---

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 40c814476b..b91efaae16 100644
--- a/Xorg/lib/qt4/Makefile
+++ b/Xorg/lib/qt4/Makefile
@@ -246,7 +246,8 @@ define Build/Configure
 	#  do not use fontconfig as it doesn't work anyway for qte
 	#  bindir: bindir is where the host tools (qmake, moc, rcc, uic) will get installed into - they are just used on the host and not goig to be packaged
 	mkdir -p $(PKG_BUILD_DIR)/mkspecs/qws/linux-openwrt-g++
-	cp -a ./files/{qmake.conf,qplatformdefs.h} $(PKG_BUILD_DIR)/mkspecs/qws/linux-openwrt-g++/
+	$(CP) ./files/qws-qmake.conf $(PKG_BUILD_DIR)/mkspecs/qws/linux-openwrt-g++/qmake.conf
+	$(CP) ./files/qws-qplatformdefs.h $(PKG_BUILD_DIR)/mkspecs/qws/linux-openwrt-g++/qplatformdefs.h
 	( cd $(PKG_BUILD_DIR) ; \
 		TARGET_CC="$(TARGET_CROSS)gcc" \
 		TARGET_CXX="$(TARGET_CROSS)g++" \
diff --git a/Xorg/lib/qt4/files/qmake.conf b/Xorg/lib/qt4/files/qmake.conf
deleted file mode 100644
index d839f7cdcb..0000000000
--- a/Xorg/lib/qt4/files/qmake.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-include(../../common/g++.conf)
-include(../../common/linux.conf)
-include(../../common/qws.conf)
-
-# QMAKE_{INC,LIB}DIR_QT needs to be overridden,
-# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default
-# which are compiled into the qmake binary statically
-QMAKE_INCDIR_QT					= $$(TARGET_INCDIRS)
-QMAKE_LIBDIR_QT					= $$(TARGET_LIBDIRS)
-QMAKE_INCDIR					= $$(TARGET_INCDIRS)
-QMAKE_LIBDIR					= $$(TARGET_LIBDIRS)
-QMAKE_MOC						= $$(STAGING_DIR_HOST)/bin/moc
-QMAKE_UIC						= $$(STAGING_DIR_HOST)/bin/uic
-QMAKE_RCC						= $$(STAGING_DIR_HOST)/bin/rcc
-QMAKE_CC						= $$(TARGET_CC)
-QMAKE_CXX						= $$(TARGET_CXX)
-QMAKE_AR						= $$(TARGET_CROSS)ar cqs
-QMAKE_OBJCOPY					= $$(TARGET_CROSS)objcopy
-QMAKE_RANLIB					= $$(TARGET_CROSS)ranlib
-QMAKE_CFLAGS					= $$(TARGET_CFLAGS)
-QMAKE_CXXFLAGS					= $$(TARGET_CFLAGS)
-QMAKE_LINK						= $$(TARGET_CXX)
-QMAKE_LINK_C					= $$(TARGET_CC)
-QMAKE_LFLAGS					= $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options
-
-#unset vars which would intefere with vars/flags passed over by OpenWrt
-QMAKE_STRIP						= # do not strip
-QMAKE_STRIPFLAGS_LIB			= # do not strip
-QMAKE_CFLAGS_WARN_ON			= 
-QMAKE_CFLAGS_WARN_OFF			= 
-QMAKE_CFLAGS_RELEASE			= 
-QMAKE_CFLAGS_DEBUG				= 
-QMAKE_CFLAGS_PRECOMPILE			= 
-QMAKE_CFLAGS_USE_PRECOMPILE		= 
-QMAKE_CXXFLAGS_WARN_ON			= 
-QMAKE_CXXFLAGS_WARN_OFF			= 
-QMAKE_CXXFLAGS_RELEASE			= 
-QMAKE_CXXFLAGS_DEBUG			= 
-QMAKE_CXXFLAGS_PRECOMPILE		= 
-QMAKE_CXXFLAGS_USE_PRECOMPILE	= 
-QMAKE_LFLAGS_RELEASE			= 
-
-load(qt_config)
diff --git a/Xorg/lib/qt4/files/qplatformdefs.h b/Xorg/lib/qt4/files/qplatformdefs.h
deleted file mode 100644
index 99e9a27923..0000000000
--- a/Xorg/lib/qt4/files/qplatformdefs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../linux-g++/qplatformdefs.h"
diff --git a/Xorg/lib/qt4/files/qws-qmake.conf b/Xorg/lib/qt4/files/qws-qmake.conf
new file mode 100644
index 0000000000..d839f7cdcb
--- /dev/null
+++ b/Xorg/lib/qt4/files/qws-qmake.conf
@@ -0,0 +1,43 @@
+include(../../common/g++.conf)
+include(../../common/linux.conf)
+include(../../common/qws.conf)
+
+# QMAKE_{INC,LIB}DIR_QT needs to be overridden,
+# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default
+# which are compiled into the qmake binary statically
+QMAKE_INCDIR_QT					= $$(TARGET_INCDIRS)
+QMAKE_LIBDIR_QT					= $$(TARGET_LIBDIRS)
+QMAKE_INCDIR					= $$(TARGET_INCDIRS)
+QMAKE_LIBDIR					= $$(TARGET_LIBDIRS)
+QMAKE_MOC						= $$(STAGING_DIR_HOST)/bin/moc
+QMAKE_UIC						= $$(STAGING_DIR_HOST)/bin/uic
+QMAKE_RCC						= $$(STAGING_DIR_HOST)/bin/rcc
+QMAKE_CC						= $$(TARGET_CC)
+QMAKE_CXX						= $$(TARGET_CXX)
+QMAKE_AR						= $$(TARGET_CROSS)ar cqs
+QMAKE_OBJCOPY					= $$(TARGET_CROSS)objcopy
+QMAKE_RANLIB					= $$(TARGET_CROSS)ranlib
+QMAKE_CFLAGS					= $$(TARGET_CFLAGS)
+QMAKE_CXXFLAGS					= $$(TARGET_CFLAGS)
+QMAKE_LINK						= $$(TARGET_CXX)
+QMAKE_LINK_C					= $$(TARGET_CC)
+QMAKE_LFLAGS					= $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options
+
+#unset vars which would intefere with vars/flags passed over by OpenWrt
+QMAKE_STRIP						= # do not strip
+QMAKE_STRIPFLAGS_LIB			= # do not strip
+QMAKE_CFLAGS_WARN_ON			= 
+QMAKE_CFLAGS_WARN_OFF			= 
+QMAKE_CFLAGS_RELEASE			= 
+QMAKE_CFLAGS_DEBUG				= 
+QMAKE_CFLAGS_PRECOMPILE			= 
+QMAKE_CFLAGS_USE_PRECOMPILE		= 
+QMAKE_CXXFLAGS_WARN_ON			= 
+QMAKE_CXXFLAGS_WARN_OFF			= 
+QMAKE_CXXFLAGS_RELEASE			= 
+QMAKE_CXXFLAGS_DEBUG			= 
+QMAKE_CXXFLAGS_PRECOMPILE		= 
+QMAKE_CXXFLAGS_USE_PRECOMPILE	= 
+QMAKE_LFLAGS_RELEASE			= 
+
+load(qt_config)
diff --git a/Xorg/lib/qt4/files/qws-qplatformdefs.h b/Xorg/lib/qt4/files/qws-qplatformdefs.h
new file mode 100644
index 0000000000..99e9a27923
--- /dev/null
+++ b/Xorg/lib/qt4/files/qws-qplatformdefs.h
@@ -0,0 +1 @@
+#include "../../linux-g++/qplatformdefs.h"