From f6f1a2dbc10ac43bbcd7d8f32af500c402b7338e Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 1 Feb 2012 10:45:51 +0100 Subject: Revert "Put the generated version.h into build tree" After discussion with Liang, I'm reverting it as he requested. This change put every header into the SYNCQT.HEADER_FILES twice for in-source builds, and the qtMODULEversion.h header did not include a path component. This reverts commit 2fbc45b58bba860abf67fb28aa1319c9f4ededaf Change-Id: Ie84cef19193ce5e49072f1f67a41140d9d2673b8 Reviewed-by: Liang Qi --- src/corelib/corelib.pro | 2 +- src/dbus/dbus.pro | 2 +- src/gui/gui.pro | 2 +- src/network/network.pro | 2 +- src/opengl/opengl.pro | 2 +- src/platformsupport/platformsupport.pro | 2 +- src/printsupport/printsupport.pro | 2 +- src/sql/sql.pro | 2 +- src/testlib/testlib.pro | 2 +- src/widgets/widgets.pro | 2 +- src/xml/xml.pro | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 85d71aabf6..ba741c656c 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -14,7 +14,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused load(qt_module_config) -HEADERS += $$OUT_PWD/qtcoreversion.h +HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h include(animation/animation.pri) include(arch/arch.pri) diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 0ce381b94e..6fd48de48d 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -33,7 +33,7 @@ win32 { } load(qt_module_config) -HEADERS += $$OUT_PWD/qtdbusversion.h +HEADERS += $$QT_SOURCE_TREE/src/dbus/qtdbusversion.h PUB_HEADERS = qdbusargument.h \ qdbusconnectioninterface.h \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8856894aff..db045930a3 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -21,7 +21,7 @@ testcocoon { load(testcocoon) } -HEADERS += $$OUT_PWD/qtguiversion.h +HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h include(accessible/accessible.pri) include(kernel/kernel.pri) diff --git a/src/network/network.pro b/src/network/network.pro index 839f944aa5..671b7fde69 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -22,7 +22,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtnetworkversion.h +HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h include(access/access.pri) include(bearer/bearer.pri) diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 989edaf3b8..89f8d0a3c2 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -17,7 +17,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$OUT_PWD/qtopenglversion.h +HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index de4b835877..36323d9766 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -19,7 +19,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) -HEADERS += $$OUT_PWD/qtplatformsupportversion.h +HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index d5ff307487..0aa92a95de 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -13,7 +13,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$OUT_PWD/qtprintsupportversion.h +HEADERS += $$QT_SOURCE_TREE/src/printsupport/qtprintsupportversion.h QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 1730a3bff3..dbeed14386 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -15,7 +15,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtsqlversion.h +HEADERS += $$QT_SOURCE_TREE/src/sql/qtsqlversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index d22d8e49c4..26769f95db 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -76,7 +76,7 @@ mac { load(qt_module_config) -HEADERS += $$OUT_PWD/qttestversion.h +HEADERS += $$QT_SOURCE_TREE/src/testlib/qttestversion.h QMAKE_TARGET_PRODUCT = QTestLib QMAKE_TARGET_DESCRIPTION = Qt \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index a48d096b8e..8f6a9713f6 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -13,7 +13,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -HEADERS += $$OUT_PWD/qtwidgetsversion.h +HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h include(../qbase.pri) diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 252bba76dc..e860250507 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -14,7 +14,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtxmlversion.h +HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h PRECOMPILED_HEADER = ../corelib/global/qt_pch.h -- cgit v1.2.3