clean up projects from QPRO_PWD nonsense, etc.

Change-Id: I4c41aedf5bfb37e31ad202cacd2312b0bdb168e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 77202a1..119cb23 100644 (file)
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtConcurrent
-QPRO_PWD   = $$PWD
 QT         = core-private
 CONFIG    += exceptions
 

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 8ea8395..d825d2d 100644 (file)
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET    = QtCore
-QPRO_PWD   = $$PWD
 QT         =
 CONFIG    += exceptions
 

diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index b8afa79..d43265c 100644 (file)
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET = QtDBus
-QPRO_PWD = $$PWD
 QT = core-private
 CONFIG += link_pkgconfig
 MODULE_CONFIG = dbusadaptors dbusinterfaces

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 49cd90a..049b831 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtGui
-QPRO_PWD   = $$PWD
 QT = core-private
 MODULE_CONFIG = opengl
 

diff --git a/src/network/network.pro b/src/network/network.pro
index a0a05df..ffd5bd9 100644 (file)
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -1,8 +1,7 @@
 load(qt_module)
 
-# Qt network module
 TARGET   = QtNetwork
-QPRO_PWD = $$PWD
+QT = core-private
 
 DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
 #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG
@@ -12,7 +11,6 @@ DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
 #DEFINES += QABSTRACTSOCKET_DEBUG QNATIVESOCKETENGINE_DEBUG
 #DEFINES += QTCPSOCKETENGINE_DEBUG QTCPSOCKET_DEBUG QTCPSERVER_DEBUG QSSLSOCKET_DEBUG
 #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG
-QT = core-private
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
 
 load(qt_module_config)

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index e6557ac..8c61ab2 100644 (file)
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtOpenGL
-QPRO_PWD   = $$PWD
 QT         = core-private gui-private widgets-private
 
 DEFINES   += QT_BUILD_OPENGL_LIB

diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index b0ab9ca..23d65b8 100644 (file)
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -1,6 +1,5 @@
 load(qt_module)
 TARGET     = QtPlatformSupport
-QPRO_PWD   = $$PWD
 QT         = core-private gui-private
 
 CONFIG += staticlib

diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro
index 9be1906..cccd639 100644 (file)
--- a/src/printsupport/printsupport.pro
+++ b/src/printsupport/printsupport.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtPrintSupport
-QPRO_PWD   = $$PWD
 QT = core-private gui-private widgets-private
 
 DEFINES   += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE

diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 1f820e8..e5d32b0 100644 (file)
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET    = QtSql
-QPRO_PWD   = $$PWD
 QT         = core-private
 
 DEFINES += QT_BUILD_SQL_LIB

diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 56d17b2..1d1849d 100644 (file)
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET = QtTest
-QPRO_PWD = $$PWD
 QT = core-private
 CONFIG += exceptions
 

diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index 4794ea7..79a266f 100644 (file)
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtWidgets
-QPRO_PWD   = $$PWD
 QT = core-private gui-private
 MODULE_CONFIG = uic
 

diff --git a/src/xml/xml.pro b/src/xml/xml.pro
index e754dc2..836e274 100644 (file)
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@@ -1,7 +1,6 @@
 load(qt_module)
 
 TARGET     = QtXml
-QPRO_PWD   = $$PWD
 QT         = core-private
 
 DEFINES   += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE