From 7d8578418d685b6e88767d3e9d2d2a590a44804a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 3 Feb 2012 22:13:12 +0100 Subject: properly declare the host tools as such in the project files don't mess with the qmake cmdline args any more. Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0 Reviewed-by: Joerg Bornemann --- src/tools/bootstrap/bootstrap.pro | 1 + src/tools/moc/moc.pro | 1 + src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 +- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 + src/tools/qdoc/qdoc.pro | 1 + src/tools/rcc/rcc.pro | 1 + src/tools/uic/uic.pro | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 239f9e58b3..8f29393be2 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = lib TARGET = bootstrap CONFIG += staticlib diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index 62d692844f..b40f21396d 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = app TARGET = moc diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 33f7937c5b..ae1edf07cd 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -1,4 +1,4 @@ - +option(host_build) TEMPLATE = app TARGET = qdbuscpp2xml diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 5c430fdfb1..ac7183775a 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = app TARGET = qdbusxml2cpp diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 348593d74a..37ec63ab04 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = app TARGET = qdoc diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index e87ef605b9..8debb03398 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = app TARGET = rcc diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 0acc6e77c8..d03645eb45 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -1,3 +1,4 @@ +option(host_build) TEMPLATE = app TARGET = uic -- cgit v1.2.3 From bcadd2ded2d86bf982564c816a6192c423ccb7e0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Apr 2012 16:50:04 +0200 Subject: remove convoluted recursive debug/release target magic this has been a) dysfunct and b) unnecessary for *quite* a while. Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann Change-Id: I5d658a15d0c1dc923002f8d773eecb8382cd213d --- src/src.pro | 40 ---------------------------------------- src/tools/tools.pro | 39 --------------------------------------- 2 files changed, 79 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index e46dc2e68a..dc3e850d8f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -74,44 +74,4 @@ sub_src_target.target = sub-src sub_src_target.recurse_target = QMAKE_EXTRA_TARGETS += sub_src_target -# This gives us a top level debug/release -for(subname, SRC_SUBDIRS) { - subdir = $$subname - !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir) - subpro = $$subdir/$${basename(subdir)}.pro - !exists($$subpro):next() - subtarget = $$replace(subdir, [^A-Za-z0-9], _) - reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\) - subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE) - subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) - subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) - include($$subpro, SUB) - !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB.TEMPLATE, lib) | isEqual(SUB.TEMPLATE, subdirs)):!separate_debug_info { - #debug - debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS - debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) - EXTRA_DEBUG_TARGETS += debug-$${subtarget} - QMAKE_EXTRA_TARGETS += debug-$${subtarget} - #release - release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS - release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release) - EXTRA_RELEASE_TARGETS += release-$${subtarget} - QMAKE_EXTRA_TARGETS += release-$${subtarget} - } else { #do not have a real debug target/release - #debug - debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS - debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first) - EXTRA_DEBUG_TARGETS += debug-$${subtarget} - QMAKE_EXTRA_TARGETS += debug-$${subtarget} - #release - release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS - release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first) - EXTRA_RELEASE_TARGETS += release-$${subtarget} - QMAKE_EXTRA_TARGETS += release-$${subtarget} - } -} -debug.depends = $$EXTRA_DEBUG_TARGETS -release.depends = $$EXTRA_RELEASE_TARGETS -QMAKE_EXTRA_TARGETS += debug release - SUBDIRS += $$SRC_SUBDIRS diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 8ad30a998d..875203b62c 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -33,44 +33,5 @@ contains(QT_CONFIG, dbus) { } } -# Special handling, depending on type of project, if it used debug/release or only has one configuration -EXTRA_DEBUG_TARGETS = -EXTRA_RELEASE_TARGETS = -for(subname, TOOLS_SUBDIRS) { - subdir = $$subname - !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir) - subpro = $$subdir/$${basename(subdir)}.pro - !exists($$subpro):next() - subtarget = $$replace(subdir, [^A-Za-z0-9], _) - reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\) - subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE) - subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) - subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) - include($$subpro, SUB) - !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB.TEMPLATE, lib) | isEqual(SUB.TEMPLATE, subdirs)):!separate_debug_info { - #debug - debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS - debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) - EXTRA_DEBUG_TARGETS += debug-$${subtarget} - QMAKE_EXTRA_TARGETS += debug-$${subtarget} - #release - release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS - release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release) - EXTRA_RELEASE_TARGETS += release-$${subtarget} - QMAKE_EXTRA_TARGETS += release-$${subtarget} - } else { #do not have a real debug target/release - #debug - debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS - debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first) - EXTRA_DEBUG_TARGETS += debug-$${subtarget} - QMAKE_EXTRA_TARGETS += debug-$${subtarget} - #release - release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS - release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first) - EXTRA_RELEASE_TARGETS += release-$${subtarget} - QMAKE_EXTRA_TARGETS += release-$${subtarget} - } -} - SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS -- cgit v1.2.3 From c7bf0448da8275f8835656ee37f2de72f22c8694 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Jun 2012 16:37:42 +0200 Subject: detach src/src.pro and src/tools/tools.pro from qtbase.pro they were included instead of being proper subdirs. this doesn't appear to be necessary for anything at this point. Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/src.pro | 18 ++++++------------ src/tools/tools.pro | 3 +-- 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index dc3e850d8f..f1ea4bbc94 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,9 +1,8 @@ TEMPLATE = subdirs # this order is important -unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain -!wince*:include(tools/tools.pro) +!wince*:SRC_SUBDIRS += src_tools SRC_SUBDIRS += src_corelib SRC_SUBDIRS += src_network src_sql src_gui src_xml src_testlib src_platformsupport src_widgets !wince*:SRC_SUBDIRS += src_printsupport @@ -16,6 +15,8 @@ contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl SRC_SUBDIRS += src_plugins +src_tools.subdir = $$PWD/tools +src_tools.target = sub-tools src_winmain.subdir = $$PWD/winmain src_winmain.target = sub-winmain src_corelib.subdir = $$PWD/corelib @@ -50,11 +51,11 @@ src_concurrent.target = sub-concurrent #CONFIG += ordered !wince*:!ordered { - src_corelib.depends = src_tools_moc src_tools_rcc + src_corelib.depends = src_tools src_gui.depends = src_corelib src_printsupport.depends = src_corelib src_gui src_widgets src_platformsupport.depends = src_corelib src_gui src_network - src_widgets.depends = src_corelib src_gui src_tools_uic + src_widgets.depends = src_corelib src_gui src_xml.depends = src_corelib src_concurrent.depends = src_corelib src_dbus.depends = src_corelib @@ -67,11 +68,4 @@ src_concurrent.target = sub-concurrent contains(QT_CONFIG, no-widgets): SRC_SUBDIRS -= src_opengl src_widgets src_printsupport -# This creates a sub-src rule -sub_src_target.CONFIG = recursive -sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS -sub_src_target.target = sub-src -sub_src_target.recurse_target = -QMAKE_EXTRA_TARGETS += sub_src_target - -SUBDIRS += $$SRC_SUBDIRS +SUBDIRS = $$SRC_SUBDIRS diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 875203b62c..bd8896259a 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -33,5 +33,4 @@ contains(QT_CONFIG, dbus) { } } -SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS -isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS +SUBDIRS = $$TOOLS_SUBDIRS -- cgit v1.2.3 From 17b6125bce3d127006cb2e48bb0a4b3be242f895 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Jun 2012 16:43:46 +0200 Subject: rewrite SUBDIRS construction logic clearer and gets the conditional dependencies right Change-Id: Ifb24a4a84caffb0e3b45af7eb8cb21f5c5861d54 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann Reviewed-by: Marius Storm-Olsen --- src/src.pro | 115 +++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 47 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index f1ea4bbc94..a474b795af 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,71 +1,92 @@ TEMPLATE = subdirs -# this order is important -win32:SRC_SUBDIRS += src_winmain -!wince*:SRC_SUBDIRS += src_tools -SRC_SUBDIRS += src_corelib -SRC_SUBDIRS += src_network src_sql src_gui src_xml src_testlib src_platformsupport src_widgets -!wince*:SRC_SUBDIRS += src_printsupport -nacl: SRC_SUBDIRS -= src_network src_testlib -contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus -contains(QT_CONFIG, concurrent):SRC_SUBDIRS += src_concurrent - -contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui - -contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl -SRC_SUBDIRS += src_plugins - src_tools.subdir = $$PWD/tools src_tools.target = sub-tools + src_winmain.subdir = $$PWD/winmain src_winmain.target = sub-winmain +src_winmain.depends = sub-corelib # just for the module .pri file + src_corelib.subdir = $$PWD/corelib src_corelib.target = sub-corelib + src_xml.subdir = $$PWD/xml src_xml.target = sub-xml +src_xml.depends = src_corelib + src_dbus.subdir = $$PWD/dbus src_dbus.target = sub-dbus -src_gui.subdir = $$PWD/gui -src_gui.target = sub-gui +src_dbus.depends = src_corelib + +src_concurrent.subdir = $$PWD/concurrent +src_concurrent.target = sub-concurrent +src_concurrent.depends = src_corelib + src_sql.subdir = $$PWD/sql src_sql.target = sub-sql +src_sql.depends = src_corelib + src_network.subdir = $$PWD/network src_network.target = sub-network -src_opengl.subdir = $$PWD/opengl -src_opengl.target = sub-opengl -src_plugins.subdir = $$PWD/plugins -src_plugins.target = sub-plugins -src_widgets.subdir = $$PWD/widgets -src_widgets.target = sub-widgets -!wince*: { - src_printsupport.subdir = $$PWD/printsupport - src_printsupport.target = sub-printsupport -} +src_network.depends = src_corelib + src_testlib.subdir = $$PWD/testlib src_testlib.target = sub-testlib +src_testlib.depends = src_corelib # src_gui & src_widgets are not build-depends + +src_gui.subdir = $$PWD/gui +src_gui.target = sub-gui +src_gui.depends = src_corelib + src_platformsupport.subdir = $$PWD/platformsupport src_platformsupport.target = sub-platformsupport -src_concurrent.subdir = $$PWD/concurrent -src_concurrent.target = sub-concurrent +src_platformsupport.depends = src_corelib src_gui src_network +src_widgets.subdir = $$PWD/widgets +src_widgets.target = sub-widgets +src_widgets.depends = src_corelib src_gui -#CONFIG += ordered -!wince*:!ordered { - src_corelib.depends = src_tools - src_gui.depends = src_corelib - src_printsupport.depends = src_corelib src_gui src_widgets - src_platformsupport.depends = src_corelib src_gui src_network - src_widgets.depends = src_corelib src_gui - src_xml.depends = src_corelib - src_concurrent.depends = src_corelib - src_dbus.depends = src_corelib - src_network.depends = src_corelib - src_opengl.depends = src_gui src_widgets - src_sql.depends = src_corelib - src_testlib.depends = src_corelib src_gui src_widgets - src_plugins.depends = src_gui src_sql src_xml src_platformsupport -} +src_opengl.subdir = $$PWD/opengl +src_opengl.target = sub-opengl +src_opengl.depends = src_gui src_widgets + +src_printsupport.subdir = $$PWD/printsupport +src_printsupport.target = sub-printsupport +src_printsupport.depends = src_corelib src_gui src_widgets + +src_plugins.subdir = $$PWD/plugins +src_plugins.target = sub-plugins +src_plugins.depends = src_sql src_xml src_network src_platformsupport -contains(QT_CONFIG, no-widgets): SRC_SUBDIRS -= src_opengl src_widgets src_printsupport +# this order is important +!wince* { + SUBDIRS += src_tools + src_corelib.depends += src_tools +} +SUBDIRS += src_corelib +win32:SUBDIRS += src_winmain +SUBDIRS += src_network src_sql src_xml src_testlib +contains(QT_CONFIG, dbus) { + SUBDIRS += src_dbus + src_plugins.depends += src_dbus +} +contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +!contains(QT_CONFIG, no-gui) { + SUBDIRS += src_gui + src_plugins.depends += src_gui + !contains(QT_CONFIG, no-widgets) { + SUBDIRS += src_platformsupport src_widgets + src_plugins.depends += src_platformsupport src_widgets + contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += src_opengl + src_plugins.depends += src_opengl + } + !wince* { + SUBDIRS += src_printsupport + src_plugins.depends += src_printsupport + } + } +} +SUBDIRS += src_plugins -SUBDIRS = $$SRC_SUBDIRS +nacl: SUBDIRS -= src_network src_testlib -- cgit v1.2.3 From 78290e66c46483a96b033d991b06288bc891b7c2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Mar 2012 16:00:06 +0200 Subject: clean up path normalization in configure.exe and QLibraryInfo always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann --- src/corelib/global/qlibraryinfo.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 801b4d94cd..d4fb8deb06 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -312,6 +312,8 @@ QLibraryInfo::rawLocation(LibraryLocation loc) } config->endGroup(); + + ret = QDir::fromNativeSeparators(ret); } } -- cgit v1.2.3 From 07581a87f82ec127db8c1032dc340685063d0acc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 12:03:01 +0200 Subject: remove some qmake -project boilerplate from project files Change-Id: I5e6103db42b4fcca4ed4c2ffaec71e71e73d5b95 Reviewed-by: Joerg Bornemann --- src/tools/moc/moc.pro | 4 ++-- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 --- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 3 --- src/tools/rcc/rcc.pro | 2 -- src/tools/uic/uic.pro | 2 -- 5 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index b40f21396d..8b53578e23 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -4,8 +4,8 @@ TARGET = moc DEFINES += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS DESTDIR = ../../../bin -INCLUDEPATH += . $$OUT_PWD/../../corelib/global -DEPENDPATH += . +INCLUDEPATH += $$OUT_PWD/../../corelib/global +DEPENDPATH += $$OUT_PWD/../../corelib/global LIBS = OBJECTS_DIR = . diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index ae1edf07cd..a109867781 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -6,9 +6,6 @@ DESTDIR = ../../../bin include(../moc/moc.pri) -INCLUDEPATH += . -DEPENDPATH += . - INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus \ $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \ diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index ac7183775a..7cefff407d 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -4,9 +4,6 @@ TARGET = qdbusxml2cpp DESTDIR = ../../../bin -INCLUDEPATH += . -DEPENDPATH += . - include(../bootstrap/bootstrap.pri) INCLUDEPATH += $$QT_BUILD_TREE/include \ diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index 8debb03398..b224f98b61 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -4,8 +4,6 @@ TARGET = rcc DESTDIR = ../../../bin DEFINES += QT_RCC -INCLUDEPATH += . -DEPENDPATH += . include(rcc.pri) HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index d03645eb45..c4b7ca2e19 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -4,8 +4,6 @@ TARGET = uic DESTDIR = ../../../bin DEFINES += QT_UIC -INCLUDEPATH += . -DEPENDPATH += . include(uic.pri) include(cpp/cpp.pri) -- cgit v1.2.3 From 290aae5a3a63c4b7963841e0922011141d795326 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 13 Mar 2012 14:25:07 +0100 Subject: remove last traces of qbase.pri, qt_targets.pri and qt_installs.pri qt_module_config.prf, qt_targets.prf and qt_installs.prf replace them Change-Id: I6fc670ce8540dbd9ddaec1632d486e43a7ebf14b Reviewed-by: Joerg Bornemann --- src/platformsupport/platformsupport.pro | 2 -- src/qbase.pri | 1 - src/qt_install.pri | 1 - src/qt_targets.pri | 1 - src/widgets/widgets.pro | 2 +- 5 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 src/qbase.pri delete mode 100644 src/qt_install.pri delete mode 100644 src/qt_targets.pri (limited to 'src') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index fba1096ab2..9a279472c9 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -17,8 +17,6 @@ load(qt_module_config) unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -include(../qbase.pri) - HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/qbase.pri b/src/qbase.pri deleted file mode 100644 index 528dd1e17a..0000000000 --- a/src/qbase.pri +++ /dev/null @@ -1 +0,0 @@ -load(qt_module_config) diff --git a/src/qt_install.pri b/src/qt_install.pri deleted file mode 100644 index 8a9a7ab5ba..0000000000 --- a/src/qt_install.pri +++ /dev/null @@ -1 +0,0 @@ -load(qt_installs) diff --git a/src/qt_targets.pri b/src/qt_targets.pri deleted file mode 100644 index 900b50bde4..0000000000 --- a/src/qt_targets.pri +++ /dev/null @@ -1 +0,0 @@ -load(qt_targets) diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 91ac4074e9..85321ff1c8 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -18,7 +18,7 @@ HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf QMAKE_DOCS_INDEX = ../../doc -include(../qbase.pri) +load(qt_module_config) #platforms mac:include(kernel/mac.pri) -- cgit v1.2.3 From 107aeb870bcae91a4cc0f12bcf787d0a7e5bc276 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 24 Feb 2012 19:21:51 +0100 Subject: move moc, rcc and uic CONFIG additions to the respective qt modules they don't belong into the global scope Change-Id: I27a3de5f706392b3c4a84035521bc3b4e4055740 Reviewed-by: Joerg Bornemann --- src/corelib/corelib.pro | 2 +- src/modules/qt_core.pri | 1 + src/modules/qt_widgets.pri | 1 + src/widgets/widgets.pro | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 545a94fdee..77666d4148 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -4,7 +4,7 @@ TARGET = QtCore QPRO_PWD = $$PWD QT = -CONFIG += module exceptions +CONFIG += module moc resources exceptions MODULE = core # not corelib, as per project file MODULE_PRI = ../modules/qt_core.pri diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri index e6e5df9d27..81059923ab 100644 --- a/src/modules/qt_core.pri +++ b/src/modules/qt_core.pri @@ -13,3 +13,4 @@ QT.core.plugins = $$QT_MODULE_PLUGIN_BASE QT.core.imports = $$QT_MODULE_IMPORT_BASE QT.core.depends = QT.core.DEFINES = QT_CORE_LIB +QT.core.CONFIG = moc resources diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri index 9e42fdae61..69ad509dc3 100644 --- a/src/modules/qt_widgets.pri +++ b/src/modules/qt_widgets.pri @@ -13,3 +13,4 @@ QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE QT.widgets.imports = $$QT_MODULE_IMPORT_BASE QT.widgets.depends = core gui QT.widgets.DEFINES = QT_WIDGETS_LIB +QT.widgets.CONFIG = uic diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 85321ff1c8..fef42b9a64 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -4,7 +4,7 @@ TARGET = QtWidgets QPRO_PWD = $$PWD QT = core core-private gui gui-private platformsupport-private -CONFIG += module +CONFIG += module uic MODULE_PRI = ../modules/qt_widgets.pri DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE -- cgit v1.2.3 From 6a8f64136e7c38fa4e94c916a57b83856ded3a8d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 May 2012 15:36:03 +0200 Subject: introduce /get property variants properties are now split into a write location $$[FOO] and a read location $$[FOO/get]. the write locations are hard-coded and configurable via qt.conf/Paths as before, while the read locations are configured via qt.conf/EffectivePaths. this finally provides a clean solution to the problem that during the qt build itself tools and libraries need to be taken from somewhere else than they are installed to. Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25 Reviewed-by: Joerg Bornemann Reviewed-by: Robin Burchell --- src/corelib/global/qlibraryinfo.cpp | 63 ++++++++++++++++++++++++++++++++----- src/corelib/global/qlibraryinfo.h | 3 +- 2 files changed, 57 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index d4fb8deb06..1bd17ce9ff 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -70,6 +70,10 @@ struct QLibrarySettings { QLibrarySettings(); QScopedPointer settings; +#ifdef QT_BUILD_QMAKE + bool haveEffectivePaths; + bool havePaths; +#endif }; Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings) @@ -77,12 +81,21 @@ class QLibraryInfoPrivate { public: static QSettings *findConfiguration(); +#ifndef QT_BUILD_QMAKE static void cleanup() { QLibrarySettings *ls = qt_library_settings(); if (ls) ls->settings.reset(0); } +#else + static bool haveGroup(QLibraryInfo::PathGroup group) + { + QLibrarySettings *ls = qt_library_settings(); + return ls ? (group == QLibraryInfo::EffectivePaths + ? ls->haveEffectivePaths : ls->havePaths) : false; + } +#endif static QSettings *configuration() { QLibrarySettings *ls = qt_library_settings(); @@ -95,7 +108,25 @@ QLibrarySettings::QLibrarySettings() { #ifndef QT_BUILD_QMAKE qAddPostRoutine(QLibraryInfoPrivate::cleanup); + bool haveEffectivePaths; + bool havePaths; #endif + if (settings) { + // This code needs to be in the regular library, as otherwise a qt.conf that + // works for qmake would break things for dynamically built Qt tools. + QStringList children = settings->childGroups(); + haveEffectivePaths = children.contains(QLatin1String("EffectivePaths")); + // Backwards compat: an existing but empty file is claimed to contain the Paths section. + havePaths = !haveEffectivePaths || children.contains(QLatin1String("Paths")); +#ifndef QT_BUILD_QMAKE + if (!havePaths) + settings.reset(0); +#else + } else { + haveEffectivePaths = false; + havePaths = false; +#endif + } } QSettings *QLibraryInfoPrivate::findConfiguration() @@ -244,11 +275,11 @@ QString QLibraryInfo::location(LibraryLocation loc) { #ifdef QT_BUILD_QMAKE - QString ret = rawLocation(loc); + QString ret = rawLocation(loc, FinalPaths); // Automatically prepend the sysroot to target paths if (loc < SysrootPath || loc > LastHostPath) { - QString sysroot = rawLocation(SysrootPath); + QString sysroot = rawLocation(SysrootPath, FinalPaths); if (!sysroot.isEmpty() && ret.length() > 2 && ret.at(1) == QLatin1Char(':') && (ret.at(2) == QLatin1Char('/') || ret.at(2) == QLatin1Char('\\'))) ret.replace(0, 2, sysroot); // Strip out the drive on Windows targets @@ -260,13 +291,25 @@ QLibraryInfo::location(LibraryLocation loc) } QString -QLibraryInfo::rawLocation(LibraryLocation loc) +QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) { #else -# define rawLocation location +# define rawLocation(loca, group) location(loca) +# define group dummy #endif QString ret; - if(!QLibraryInfoPrivate::configuration()) { +#ifdef QT_BUILD_QMAKE + // Logic for choosing the right data source: if EffectivePaths are requested + // and qt.conf with that section is present, use it, otherwise fall back to + // FinalPaths. For FinalPaths, use qt.conf if present and contains not only + // [EffectivePaths], otherwise fall back to builtins. + if (!QLibraryInfoPrivate::haveGroup(group) + && (group == FinalPaths + || !(group = FinalPaths, QLibraryInfoPrivate::haveGroup(FinalPaths)))) +#else + if (!QLibraryInfoPrivate::configuration()) +#endif + { const char *path = 0; if (loc >= 0 && loc < sizeof(qt_configure_prefix_path_strs)/sizeof(qt_configure_prefix_path_strs[0])) path = qt_configure_prefix_path_strs[loc] + 12; @@ -291,7 +334,11 @@ QLibraryInfo::rawLocation(LibraryLocation loc) if(!key.isNull()) { QSettings *config = QLibraryInfoPrivate::configuration(); - config->beginGroup(QLatin1String("Paths")); + config->beginGroup(QLatin1String( +#ifdef QT_BUILD_QMAKE + group == EffectivePaths ? "EffectivePaths" : +#endif + "Paths")); ret = config->value(key, defaultValue).toString(); @@ -327,7 +374,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc) baseDir = QFileInfo(qmake_libraryInfoFile()).absolutePath(); } else if (loc > SysrootPath && loc <= LastHostPath) { // We make any other host path absolute to the host prefix directory. - baseDir = rawLocation(HostPrefixPath); + baseDir = rawLocation(HostPrefixPath, group); #else if (loc == PrefixPath) { if (QCoreApplication::instance()) { @@ -349,7 +396,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc) #endif } else { // we make any other path absolute to the prefix directory - baseDir = rawLocation(PrefixPath); + baseDir = rawLocation(PrefixPath, group); } ret = QDir::cleanPath(baseDir + QLatin1Char('/') + ret); } diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 5666afbad8..5861b4b8bd 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -90,7 +90,8 @@ public: }; static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BUILD_QMAKE - static QString rawLocation(LibraryLocation); + enum PathGroup { FinalPaths, EffectivePaths }; + static QString rawLocation(LibraryLocation, PathGroup); #endif private: -- cgit v1.2.3 From f4b7e33c0b39b33542194b06d6268a841a55a469 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 13 Mar 2012 15:53:10 +0100 Subject: make qt_module_config.prf install the module pri file absorb module.prf into qt_installs.prf, as that's where it belongs. add qt_install_module option and automatically set it in qt_module_config. make qt_installs use that option. Change-Id: I860616f3a29a456f7b88ddaffa09375400c8911e Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 +- src/corelib/corelib.pro | 2 +- src/dbus/dbus.pro | 2 +- src/gui/gui.pro | 1 - src/network/network.pro | 1 - src/opengl/opengl.pro | 1 - src/platformsupport/platformsupport.pro | 1 - src/printsupport/printsupport.pro | 1 - src/sql/sql.pro | 1 - src/testlib/testlib.pro | 2 +- src/widgets/widgets.pro | 2 +- src/xml/xml.pro | 1 - 12 files changed, 5 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index b0809c8939..0ee8e9b89a 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -3,8 +3,8 @@ load(qt_module) TARGET = QtConcurrent QPRO_PWD = $$PWD QT = core-private +CONFIG += exceptions -CONFIG += module exceptions MODULE_PRI = ../modules/qt_concurrent.pri DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 77666d4148..2a2f2049e8 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -3,8 +3,8 @@ load(qt_module) TARGET = QtCore QPRO_PWD = $$PWD QT = +CONFIG += moc resources exceptions -CONFIG += module moc resources exceptions MODULE = core # not corelib, as per project file MODULE_PRI = ../modules/qt_core.pri diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index b1a3e12e1f..05562da485 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,8 +3,8 @@ load(qt_module) TARGET = QtDBus QPRO_PWD = $$PWD QT = core-private +CONFIG += link_pkgconfig -CONFIG += link_pkgconfig module MODULE_PRI = ../modules/qt_dbus.pri DEFINES += QT_BUILD_DBUS_LIB \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index b1f4a106a4..ec2702ae8e 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -4,7 +4,6 @@ TARGET = QtGui QPRO_PWD = $$PWD QT = core-private -CONFIG += module MODULE_PRI = ../modules/qt_gui.pri DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE diff --git a/src/network/network.pro b/src/network/network.pro index 3e1bc6d4e5..ef1b5ba70d 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -4,7 +4,6 @@ load(qt_module) TARGET = QtNetwork QPRO_PWD = $$PWD -CONFIG += module MODULE_PRI = ../modules/qt_network.pri DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index f1589694a8..c2c4d7197e 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -4,7 +4,6 @@ TARGET = QtOpenGL QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -CONFIG += module MODULE_PRI = ../modules/qt_opengl.pri DEFINES += QT_BUILD_OPENGL_LIB diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 9a279472c9..821d2d0aad 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -5,7 +5,6 @@ QT += core-private gui-private TEMPLATE = lib DESTDIR = $$QT.gui.libs -CONFIG += module CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index 9002ba3996..574d32b710 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -4,7 +4,6 @@ TARGET = QtPrintSupport QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -CONFIG += module MODULE_PRI = ../modules/qt_printsupport.pri DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE diff --git a/src/sql/sql.pro b/src/sql/sql.pro index c2345d92ef..1b7e1b8d85 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -4,7 +4,6 @@ TARGET = QtSql QPRO_PWD = $$PWD QT = core-private -CONFIG += module MODULE_PRI = ../modules/qt_sql.pri DEFINES += QT_BUILD_SQL_LIB diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 1a76a3b556..8a7e8724a2 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -3,8 +3,8 @@ load(qt_module) TARGET = QtTest QPRO_PWD = $$PWD QT = core-private +CONFIG += exceptions -CONFIG += module exceptions MODULE_PRI = ../modules/qt_testlib.pri INCLUDEPATH += . diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index fef42b9a64..138db98100 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -3,8 +3,8 @@ load(qt_module) TARGET = QtWidgets QPRO_PWD = $$PWD QT = core core-private gui gui-private platformsupport-private +CONFIG += uic -CONFIG += module uic MODULE_PRI = ../modules/qt_widgets.pri DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 2fff0218e4..acec24108d 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -4,7 +4,6 @@ TARGET = QtXml QPRO_PWD = $$PWD QT = core-private -CONFIG += module MODULE_PRI = ../modules/qt_xml.pri DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE -- cgit v1.2.3 From 0202e15617e8bdab31fb7e2b358f5fd0d605acc5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Apr 2012 19:30:20 +0200 Subject: remove explicit RCC_DIR addition to INCLUDEPATH qrc_ files are generally not meant to be included, so there is not much point in doing this. qprintsupport was a notable exception - which broke on mac and thus needed a hack. just remove the qrc_ inclusion. Change-Id: If5115665f331a280869e800673bf7b81d3ab559a Reviewed-by: Joerg Bornemann --- src/printsupport/dialogs/qprintdialog_unix.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 206ef7380b..3b189e2cb5 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -1351,9 +1351,6 @@ QT_END_NAMESPACE #include "moc_qprintdialog.cpp" #include "qprintdialog_unix.moc" -#ifndef Q_OS_MAC -#include "qrc_qprintdialog.cpp" -#endif #endif // QT_NO_PRINTDIALOG -- cgit v1.2.3 From e203e42906b85485ff093d5cd5122e72550adaa9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 Apr 2012 12:48:43 +0200 Subject: automatically add the version header to HEADERS Change-Id: I7c2e1d852ebdbc5cca7a3a31ab2b4c9ab9faffd9 Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 -- 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 -- 12 files changed, 24 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 0ee8e9b89a..24f976ab92 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -14,8 +14,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/concurrent/qtconcurrentversion.h - PRECOMPILED_HEADER = ../corelib/global/qt_pch.h SOURCES += \ diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 2a2f2049e8..156176730e 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -14,8 +14,6 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h - QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 05562da485..008b30952c 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -33,8 +33,6 @@ win32 { } load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/dbus/qtdbusversion.h - QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/gui/gui.pro b/src/gui/gui.pro index ec2702ae8e..915943bfad 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -20,8 +20,6 @@ testcocoon { load(testcocoon) } -HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h - QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/network/network.pro b/src/network/network.pro index ef1b5ba70d..ef63f7e385 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -21,8 +21,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h - QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index c2c4d7197e..e5951de7ad 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -16,8 +16,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h - contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 821d2d0aad..23d840fcbb 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -16,8 +16,6 @@ load(qt_module_config) unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -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 574d32b710..aa5ce2ea07 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -12,8 +12,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/printsupport/qtprintsupportversion.h - QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 1b7e1b8d85..ac730496fa 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -14,8 +14,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/sql/qtsqlversion.h - DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h SQL_P = sql diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 8a7e8724a2..ee29fa7fa4 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -83,8 +83,6 @@ mac { load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/testlib/qttestversion.h - QMAKE_TARGET_PRODUCT = QTestLib QMAKE_TARGET_DESCRIPTION = Qt \ Unit \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 138db98100..ee7a65141c 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -13,8 +13,6 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h - QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/xml/xml.pro b/src/xml/xml.pro index acec24108d..a890730977 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -13,8 +13,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h - QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf QMAKE_DOCS_INDEX = ../../doc -- cgit v1.2.3 From fb36b22269b62f04c7e158412aed4348bd4a2e56 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 Apr 2012 11:54:35 +0200 Subject: don't refer to module versions during bootstrap once we auto-generate the pris while building their respective modules, the versions won't be available during bootstrap yet. however, as these are core modules, their version is locked to the global $$QT_VERSION anyway, so just use that. Change-Id: I092f5e7d4dfe99c03e0df71f9409cac9be9f2297 Reviewed-by: Konstantin Ritt --- src/tools/bootstrap/bootstrap.pri | 4 ++-- src/tools/bootstrap/bootstrap.pro | 4 ++-- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 4 ++-- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 4 ++-- src/tools/qdoc/qdoc.pro | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index f6f8eba82b..5ea10d0e46 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -27,8 +27,8 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore + $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ + $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_SOURCE_TREE/src/corelib/kernel \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 8f29393be2..afb1448be2 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -31,8 +31,8 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore + $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ + $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index a109867781..6dc6699b9b 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -8,8 +8,8 @@ include(../moc/moc.pri) INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus \ - $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \ - $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \ + $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \ + $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 7cefff407d..aebdef50ad 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -8,8 +8,8 @@ include(../bootstrap/bootstrap.pri) INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus \ - $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \ - $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \ + $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \ + $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 37ec63ab04..9a4796cebe 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -12,8 +12,8 @@ DEFINES += QT_NO_TRANSLATION INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \ $$QT_BUILD_TREE/include/QtXml \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml + $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION \ + $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION/QtXml DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \ -- cgit v1.2.3 From 0b76b7ab8a37aa49a8aa7261f3e079bd8674ee47 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 4 Jun 2012 17:12:24 +0200 Subject: auto-generate module pris Change-Id: I654428771034221ccf424be34d5d9c7764daf3b4 Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 -- src/corelib/corelib.pro | 2 +- src/dbus/dbus.pro | 3 +-- src/gui/gui.pro | 3 +-- src/modules/qt_concurrent.pri | 15 --------------- src/modules/qt_core.pri | 16 ---------------- src/modules/qt_dbus.pri | 16 ---------------- src/modules/qt_gui.pri | 15 --------------- src/modules/qt_network.pri | 15 --------------- src/modules/qt_opengl.pri | 16 ---------------- src/modules/qt_platformsupport.pri | 16 ---------------- src/modules/qt_printsupport.pri | 14 -------------- src/modules/qt_sql.pri | 15 --------------- src/modules/qt_testlib.pri | 16 ---------------- src/modules/qt_widgets.pri | 16 ---------------- src/modules/qt_xml.pri | 15 --------------- src/network/network.pro | 2 -- src/opengl/opengl.pro | 2 -- src/platformsupport/platformsupport.pro | 6 +----- src/printsupport/printsupport.pro | 2 -- src/sql/sql.pro | 2 -- src/testlib/testlib.pro | 2 +- src/widgets/widgets.pro | 6 ++---- src/xml/xml.pro | 2 -- 24 files changed, 7 insertions(+), 212 deletions(-) delete mode 100644 src/modules/qt_concurrent.pri delete mode 100644 src/modules/qt_core.pri delete mode 100644 src/modules/qt_dbus.pri delete mode 100644 src/modules/qt_gui.pri delete mode 100644 src/modules/qt_network.pri delete mode 100644 src/modules/qt_opengl.pri delete mode 100644 src/modules/qt_platformsupport.pri delete mode 100644 src/modules/qt_printsupport.pri delete mode 100644 src/modules/qt_sql.pri delete mode 100644 src/modules/qt_testlib.pri delete mode 100644 src/modules/qt_widgets.pri delete mode 100644 src/modules/qt_xml.pri (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 24f976ab92..5040d59a17 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -5,8 +5,6 @@ QPRO_PWD = $$PWD QT = core-private CONFIG += exceptions -MODULE_PRI = ../modules/qt_concurrent.pri - DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 156176730e..e91d6cda79 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -6,7 +6,7 @@ QT = CONFIG += moc resources exceptions MODULE = core # not corelib, as per project file -MODULE_PRI = ../modules/qt_core.pri +MODULE_CONFIG = moc resources DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 008b30952c..358c86baad 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -4,8 +4,7 @@ TARGET = QtDBus QPRO_PWD = $$PWD QT = core-private CONFIG += link_pkgconfig - -MODULE_PRI = ../modules/qt_dbus.pri +MODULE_CONFIG = dbusadaptors dbusinterfaces DEFINES += QT_BUILD_DBUS_LIB \ DBUS_API_SUBJECT_TO_CHANGE diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 915943bfad..d14e275353 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -3,8 +3,7 @@ load(qt_module) TARGET = QtGui QPRO_PWD = $$PWD QT = core-private - -MODULE_PRI = ../modules/qt_gui.pri +MODULE_CONFIG = opengl DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE diff --git a/src/modules/qt_concurrent.pri b/src/modules/qt_concurrent.pri deleted file mode 100644 index eccec12f66..0000000000 --- a/src/modules/qt_concurrent.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.concurrent.VERSION = 5.0.0 -QT.concurrent.MAJOR_VERSION = 5 -QT.concurrent.MINOR_VERSION = 0 -QT.concurrent.PATCH_VERSION = 0 - -QT.concurrent.name = QtConcurrent -QT.concurrent.bins = $$QT_MODULE_BIN_BASE -QT.concurrent.includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent -QT.concurrent.private_includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent/$$QT.concurrent.VERSION -QT.concurrent.sources = $$QT_MODULE_BASE/src/concurrent -QT.concurrent.libs = $$QT_MODULE_LIB_BASE -QT.concurrent.plugins = $$QT_MODULE_PLUGIN_BASE -QT.concurrent.imports = $$QT_MODULE_IMPORT_BASE -QT.concurrent.depends = core -QT.concurrent.DEFINES = QT_CONCURRENT_LIB diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri deleted file mode 100644 index 81059923ab..0000000000 --- a/src/modules/qt_core.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.core.VERSION = 5.0.0 -QT.core.MAJOR_VERSION = 5 -QT.core.MINOR_VERSION = 0 -QT.core.PATCH_VERSION = 0 - -QT.core.name = QtCore -QT.core.bins = $$QT_MODULE_BIN_BASE -QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore -QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/$$QT.core.VERSION -QT.core.sources = $$QT_MODULE_BASE/src/corelib -QT.core.libs = $$QT_MODULE_LIB_BASE -QT.core.plugins = $$QT_MODULE_PLUGIN_BASE -QT.core.imports = $$QT_MODULE_IMPORT_BASE -QT.core.depends = -QT.core.DEFINES = QT_CORE_LIB -QT.core.CONFIG = moc resources diff --git a/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri deleted file mode 100644 index 8514265f8c..0000000000 --- a/src/modules/qt_dbus.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.dbus.VERSION = 5.0.0 -QT.dbus.MAJOR_VERSION = 5 -QT.dbus.MINOR_VERSION = 0 -QT.dbus.PATCH_VERSION = 0 - -QT.dbus.name = QtDBus -QT.dbus.bins = $$QT_MODULE_BIN_BASE -QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus -QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT.dbus.VERSION -QT.dbus.sources = $$QT_MODULE_BASE/src/dbus -QT.dbus.libs = $$QT_MODULE_LIB_BASE -QT.dbus.plugins = $$QT_MODULE_PLUGIN_BASE -QT.dbus.imports = $$QT_MODULE_IMPORT_BASE -QT.dbus.depends = core -QT.dbus.CONFIG = dbusadaptors dbusinterfaces -QT.dbus.DEFINES = QT_DBUS_LIB diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri deleted file mode 100644 index 2dfbb4a604..0000000000 --- a/src/modules/qt_gui.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.gui.VERSION = 5.0.0 -QT.gui.MAJOR_VERSION = 5 -QT.gui.MINOR_VERSION = 0 -QT.gui.PATCH_VERSION = 0 - -QT.gui.name = QtGui -QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui -QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/$$QT.gui.VERSION -QT.gui.sources = $$QT_MODULE_BASE/src/gui -QT.gui.libs = $$QT_MODULE_LIB_BASE -QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE -QT.gui.imports = $$QT_MODULE_IMPORT_BASE -QT.gui.depends = core -QT.gui.CONFIG = opengl -QT.gui.DEFINES = QT_GUI_LIB diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri deleted file mode 100644 index 76b462286f..0000000000 --- a/src/modules/qt_network.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.network.VERSION = 5.0.0 -QT.network.MAJOR_VERSION = 5 -QT.network.MINOR_VERSION = 0 -QT.network.PATCH_VERSION = 0 - -QT.network.name = QtNetwork -QT.network.bins = $$QT_MODULE_BIN_BASE -QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork -QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/$$QT.network.VERSION -QT.network.sources = $$QT_MODULE_BASE/src/network -QT.network.libs = $$QT_MODULE_LIB_BASE -QT.network.plugins = $$QT_MODULE_PLUGIN_BASE -QT.network.imports = $$QT_MODULE_IMPORT_BASE -QT.network.depends = core -QT.network.DEFINES = QT_NETWORK_LIB diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri deleted file mode 100644 index 22476cf949..0000000000 --- a/src/modules/qt_opengl.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.opengl.VERSION = 5.0.0 -QT.opengl.MAJOR_VERSION = 5 -QT.opengl.MINOR_VERSION = 0 -QT.opengl.PATCH_VERSION = 0 - -QT.opengl.name = QtOpenGL -QT.opengl.bins = $$QT_MODULE_BIN_BASE -QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL -QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/$$QT.opengl.VERSION -QT.opengl.sources = $$QT_MODULE_BASE/src/opengl -QT.opengl.libs = $$QT_MODULE_LIB_BASE -QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE -QT.opengl.imports = $$QT_MODULE_IMPORT_BASE -QT.opengl.depends = core gui widgets -QT.opengl.CONFIG = opengl -QT.opengl.DEFINES = QT_OPENGL_LIB diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri deleted file mode 100644 index 6671cc0584..0000000000 --- a/src/modules/qt_platformsupport.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.platformsupport.VERSION = 5.0.0 -QT.platformsupport.MAJOR_VERSION = 5 -QT.platformsupport.MINOR_VERSION = 0 -QT.platformsupport.PATCH_VERSION = 0 - -QT.platformsupport.name = QtPlatformSupport -QT.platformsupport.bins = $$QT_MODULE_BIN_BASE -QT.platformsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport -QT.platformsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport/$$QT.platformsupport.VERSION -QT.platformsupport.sources = $$QT_MODULE_BASE/src/platformsupport -QT.platformsupport.libs = $$QT_MODULE_LIB_BASE -QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE -QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE -QT.platformsupport.depends = core gui -QT.platformsupport.module_config = staticlib -QT.platformsupport.DEFINES = diff --git a/src/modules/qt_printsupport.pri b/src/modules/qt_printsupport.pri deleted file mode 100644 index 85603296a6..0000000000 --- a/src/modules/qt_printsupport.pri +++ /dev/null @@ -1,14 +0,0 @@ -QT.printsupport.VERSION = 5.0.0 -QT.printsupport.MAJOR_VERSION = 5 -QT.printsupport.MINOR_VERSION = 0 -QT.printsupport.PATCH_VERSION = 0 - -QT.printsupport.name = QtPrintSupport -QT.printsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport -QT.printsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport/$$QT.printsupport.VERSION -QT.printsupport.sources = $$QT_MODULE_BASE/src/printsupport -QT.printsupport.libs = $$QT_MODULE_LIB_BASE -QT.printsupport.plugins = $$QT_MODULE_PLUGIN_BASE -QT.printsupport.imports = $$QT_MODULE_IMPORT_BASE -QT.printsupport.depends = core gui widgets -QT.printsupport.DEFINES = QT_PRINTSUPPORT_LIB diff --git a/src/modules/qt_sql.pri b/src/modules/qt_sql.pri deleted file mode 100644 index 02f48d2a6b..0000000000 --- a/src/modules/qt_sql.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.sql.VERSION = 5.0.0 -QT.sql.MAJOR_VERSION = 5 -QT.sql.MINOR_VERSION = 0 -QT.sql.PATCH_VERSION = 0 - -QT.sql.name = QtSql -QT.sql.bins = $$QT_MODULE_BIN_BASE -QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql -QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/$$QT.sql.VERSION -QT.sql.sources = $$QT_MODULE_BASE/src/sql -QT.sql.libs = $$QT_MODULE_LIB_BASE -QT.sql.plugins = $$QT_MODULE_PLUGIN_BASE -QT.sql.imports = $$QT_MODULE_IMPORT_BASE -QT.sql.depends = core -QT.sql.DEFINES = QT_SQL_LIB diff --git a/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri deleted file mode 100644 index 8f6a342a58..0000000000 --- a/src/modules/qt_testlib.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.testlib.VERSION = 5.0.0 -QT.testlib.MAJOR_VERSION = 5 -QT.testlib.MINOR_VERSION = 0 -QT.testlib.PATCH_VERSION = 0 - -QT.testlib.name = QtTest -QT.testlib.bins = $$QT_MODULE_BIN_BASE -QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest -QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/$$QT.testlib.VERSION -QT.testlib.sources = $$QT_MODULE_BASE/src/testlib -QT.testlib.libs = $$QT_MODULE_LIB_BASE -QT.testlib.plugins = $$QT_MODULE_PLUGIN_BASE -QT.testlib.imports = $$QT_MODULE_IMPORT_BASE -QT.testlib.depends = core -QT.testlib.CONFIG = console -QT.testlib.DEFINES = QT_TESTLIB_LIB QT_TESTCASE_BUILDDIR=\\\"$$OUT_PWD\\\" diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri deleted file mode 100644 index 69ad509dc3..0000000000 --- a/src/modules/qt_widgets.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.widgets.VERSION = 5.0.0 -QT.widgets.MAJOR_VERSION = 5 -QT.widgets.MINOR_VERSION = 0 -QT.widgets.PATCH_VERSION = 0 - -QT.widgets.name = QtWidgets -QT.widgets.bins = $$QT_MODULE_BIN_BASE -QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets -QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION -QT.widgets.sources = $$QT_MODULE_BASE/src/widgets -QT.widgets.libs = $$QT_MODULE_LIB_BASE -QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE -QT.widgets.imports = $$QT_MODULE_IMPORT_BASE -QT.widgets.depends = core gui -QT.widgets.DEFINES = QT_WIDGETS_LIB -QT.widgets.CONFIG = uic diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri deleted file mode 100644 index ea831236e6..0000000000 --- a/src/modules/qt_xml.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.xml.VERSION = 5.0.0 -QT.xml.MAJOR_VERSION = 5 -QT.xml.MINOR_VERSION = 0 -QT.xml.PATCH_VERSION = 0 - -QT.xml.name = QtXml -QT.xml.bins = $$QT_MODULE_BIN_BASE -QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml -QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/$$QT.xml.VERSION -QT.xml.sources = $$QT_MODULE_BASE/src/xml -QT.xml.libs = $$QT_MODULE_LIB_BASE -QT.xml.plugins = $$QT_MODULE_PLUGIN_BASE -QT.xml.imports = $$QT_MODULE_IMPORT_BASE -QT.xml.depends = core -QT.xml.DEFINES = QT_XML_LIB diff --git a/src/network/network.pro b/src/network/network.pro index ef63f7e385..a1f1698c0a 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -4,8 +4,6 @@ load(qt_module) TARGET = QtNetwork QPRO_PWD = $$PWD -MODULE_PRI = ../modules/qt_network.pri - DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG #DEFINES += QNETWORKDISKCACHE_DEBUG diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index e5951de7ad..9e1394fd83 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -4,8 +4,6 @@ TARGET = QtOpenGL QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -MODULE_PRI = ../modules/qt_opengl.pri - DEFINES += QT_BUILD_OPENGL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 23d840fcbb..1c6ea6c905 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,15 +1,11 @@ load(qt_module) TARGET = QtPlatformSupport QPRO_PWD = $$PWD -QT += core-private gui-private -TEMPLATE = lib -DESTDIR = $$QT.gui.libs +QT = core-private gui-private CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon -MODULE_PRI = ../modules/qt_platformsupport.pri - DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB load(qt_module_config) diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index aa5ce2ea07..fb8a518ec3 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -4,8 +4,6 @@ TARGET = QtPrintSupport QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -MODULE_PRI = ../modules/qt_printsupport.pri - DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui diff --git a/src/sql/sql.pro b/src/sql/sql.pro index ac730496fa..26e73e5258 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -4,8 +4,6 @@ TARGET = QtSql QPRO_PWD = $$PWD QT = core-private -MODULE_PRI = ../modules/qt_sql.pri - DEFINES += QT_BUILD_SQL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index ee29fa7fa4..56d17b2d7a 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -5,7 +5,7 @@ QPRO_PWD = $$PWD QT = core-private CONFIG += exceptions -MODULE_PRI = ../modules/qt_testlib.pri +MODULE_CONFIG = console testlib_defines INCLUDEPATH += . unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index ee7a65141c..f3e14b73b0 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -2,10 +2,8 @@ load(qt_module) TARGET = QtWidgets QPRO_PWD = $$PWD -QT = core core-private gui gui-private platformsupport-private -CONFIG += uic - -MODULE_PRI = ../modules/qt_widgets.pri +QT = core-private gui-private +MODULE_CONFIG = uic DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 diff --git a/src/xml/xml.pro b/src/xml/xml.pro index a890730977..4b17f62b48 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -4,8 +4,6 @@ TARGET = QtXml QPRO_PWD = $$PWD QT = core-private -MODULE_PRI = ../modules/qt_xml.pri - DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 -- cgit v1.2.3 From 0b37ec3321323a242ad63459afcf01ca9ac61988 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 Apr 2012 17:46:42 +0200 Subject: don't use qt_module_config for winmain it is not really a Qt module, and pretending causes some messups. Change-Id: Id0980f7c00d6d176dd4937f8b265b8b571aa1277 Reviewed-by: Joerg Bornemann --- src/winmain/winmain.pro | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 1d2c097c20..6f27ce7381 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -1,24 +1,32 @@ -# Additional Qt project file for qtmain lib on Windows -TEMPLATE = lib -TARGET = qtmain -QT = - -CONFIG += staticlib warn_on -CONFIG -= qt shared - -win32 { - win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi - win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi - win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7 - win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7 - win32-g++*:DEFINES += QT_NEEDS_QMAIN - win32-borland:DEFINES += QT_NEEDS_QMAIN - SOURCES = qtmain_win.cpp - CONFIG += png - INCLUDEPATH += tmp $$QT.core.includes -} +load(qt_module) +# Additional Qt project file for qtmain lib on Windows !win32:error("$$_FILE_ is intended only for Windows!") -load(qt_module_config) + +TEMPLATE = lib +TARGET = qtmain DESTDIR = $$QT.core.libs + +CONFIG += static warn_on depend_includepath +CONFIG -= fix_output_dirs +QT = # qt.prf is still needed for some DEFINES, etc. + +contains(QT_CONFIG, build_all):CONFIG += build_all + +win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi +win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi +win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7 +win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7 +win32-g++*|win32-borland:DEFINES += QT_NEEDS_QMAIN + +INCLUDEPATH += $$QT.core.includes + +SOURCES = qtmain_win.cpp + +load(qt_installs) + +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end + +load(qt_targets) + wince*:QMAKE_POST_LINK = -- cgit v1.2.3 From f3cca88ac4388eb765bde675c320edf493686810 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Apr 2012 20:04:23 +0200 Subject: move QMAKE_PKGCONFIG_VARIABLES stuff out of qt_module_config.prf this only needs to be set in one module each - the one which provides the relevant tool. this is moderately source-incompatible, in that a package which queries a given variable from the wrong library won't get the path it looks for any more. as it's likely that everyone was using QtCore as a reference anyway, this will only affect uic - which is in the new QtWidgets library, to which people need to adjust anyway. Change-Id: If05d3c33fda6cd12466e261391b825c59651d3e4 Reviewed-by: Joerg Bornemann --- src/corelib/corelib.pro | 26 +++++++++++++++++++++++++- src/widgets/widgets.pro | 7 +++++++ 2 files changed, 32 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index e91d6cda79..8ea8395544 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtCore QPRO_PWD = $$PWD QT = -CONFIG += moc resources exceptions +CONFIG += exceptions MODULE = core # not corelib, as per project file MODULE_CONFIG = moc resources @@ -48,3 +48,27 @@ QMAKE_LIBS += $$QMAKE_LIBS_CORE QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist contains(DEFINES,QT_EVAL):include(eval.pri) + +load(moc) +load(resources) + +moc_dir.name = moc_location +moc_dir.variable = QMAKE_MOC + +rcc_dir.name = rcc_location +rcc_dir.variable = QMAKE_RCC + +QMAKE_PKGCONFIG_VARIABLES += moc_dir rcc_dir + +# These are aliens, but Linguist installs no own module, and it fits here best. + +qtPrepareTool(QMAKE_LUPDATE, lupdate) +qtPrepareTool(QMAKE_LRELEASE, lrelease) + +lupdate_dir.name = lupdate_location +lupdate_dir.variable = QMAKE_LUPDATE + +lrelease_dir.name = lrelease_location +lrelease_dir.variable = QMAKE_LRELEASE + +QMAKE_PKGCONFIG_VARIABLES += lupdate_dir lrelease_dir diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index f3e14b73b0..2df97fb98b 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -52,3 +52,10 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src win32:!contains(QT_CONFIG, directwrite) { DEFINES += QT_NO_DIRECTWRITE } + +load(uic) + +uic_dir.name = uic_location +uic_dir.variable = QMAKE_UIC + +QMAKE_PKGCONFIG_VARIABLES += uic_dir -- cgit v1.2.3 From 131ba187f28065ded8fddcfbf20c83fc259e5f23 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Apr 2012 20:35:04 +0200 Subject: auto-generate QMAKE_PKGCONFIG_REQUIRES and QMAKE_PKGCONFIG_DESCRIPTION less boilerplate, more accuracy Change-Id: I6cc2abd50eafb4901d987c122f10a62ec9ea9da3 Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 -- src/dbus/dbus.pro | 6 ------ 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/widgets/widgets.pro | 2 -- src/xml/xml.pro | 2 -- 10 files changed, 24 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 5040d59a17..77202a1b60 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -8,8 +8,6 @@ CONFIG += exceptions DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 358c86baad..b8afa791d1 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -15,12 +15,6 @@ contains(QT_CONFIG, dbus-linked) { } # INCLUDEPATH += . -unix|win32-g++* { - QMAKE_PKGCONFIG_DESCRIPTION = Qt \ - DBus \ - module - QMAKE_PKGCONFIG_REQUIRES = QtCore -} win32 { wince*:LIBS_PRIVATE += -lws2 else:LIBS_PRIVATE += -lws2_32 \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index d14e275353..49cd90a6ab 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -7,8 +7,6 @@ MODULE_CONFIG = opengl DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) # Code coverage with TestCocoon diff --git a/src/network/network.pro b/src/network/network.pro index a1f1698c0a..a0a05df1ef 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -15,8 +15,6 @@ DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE QT = core-private win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 9e1394fd83..e6557acf45 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -10,8 +10,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - load(qt_module_config) contains(QT_CONFIG, opengl):CONFIG += opengl diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 1c6ea6c905..b0ab9caea1 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -10,8 +10,6 @@ DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB load(qt_module_config) -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - 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 fb8a518ec3..9be1906f5c 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -6,8 +6,6 @@ QT = core-private gui-private widgets-private DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - load(qt_module_config) QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 26e73e5258..1f820e86eb 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -8,8 +8,6 @@ DEFINES += QT_BUILD_SQL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 2df97fb98b..4794ea7839 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -9,8 +9,6 @@ DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf QMAKE_DOCS_INDEX = ../../doc diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 4b17f62b48..e754dc2242 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -7,8 +7,6 @@ QT = core-private DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf -- cgit v1.2.3 From 6fb0b7f5fc68f9996905b12f08b4113e7cd22528 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Apr 2012 20:42:59 +0200 Subject: clean up projects from QPRO_PWD nonsense, etc. Change-Id: I4c41aedf5bfb37e31ad202cacd2312b0bdb168e2 Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 1 - src/corelib/corelib.pro | 1 - src/dbus/dbus.pro | 1 - src/gui/gui.pro | 1 - src/network/network.pro | 4 +--- src/opengl/opengl.pro | 1 - src/platformsupport/platformsupport.pro | 1 - src/printsupport/printsupport.pro | 1 - src/sql/sql.pro | 1 - src/testlib/testlib.pro | 1 - src/widgets/widgets.pro | 1 - src/xml/xml.pro | 1 - 12 files changed, 1 insertion(+), 14 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 77202a1b60..119cb234b6 100644 --- 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 8ea8395544..d825d2dad4 100644 --- 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 b8afa791d1..d43265cfc7 100644 --- 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 49cd90a6ab..049b83116c 100644 --- 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 a0a05df1ef..ffd5bd949a 100644 --- 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 e6557acf45..8c61ab23c8 100644 --- 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 b0ab9caea1..23d65b8f82 100644 --- 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 9be1906f5c..cccd63939e 100644 --- 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 1f820e86eb..e5d32b0797 100644 --- 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 56d17b2d7a..1d1849d406 100644 --- 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 4794ea7839..79a266fb15 100644 --- 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 e754dc2242..836e274bb6 100644 --- 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 -- cgit v1.2.3 From c595988a5841deaf04aaac61b5354c120b9e4b0f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 Apr 2012 17:28:49 +0200 Subject: automatically add QT_BUILD_FOO_LIB to DEFINES Change-Id: I35d9861e48469eb5cc8824e361450684047e6559 Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 +- src/corelib/corelib.pro | 2 +- src/dbus/dbus.pro | 3 +-- src/gui/gui.pro | 2 +- src/network/network.pro | 2 +- src/opengl/opengl.pro | 1 - src/platformsupport/platformsupport.pro | 2 -- src/printsupport/printsupport.pro | 2 +- src/sql/sql.pro | 1 - src/testlib/qtest_global.h | 2 +- src/testlib/testlib.pro | 1 - src/widgets/widgets.pro | 2 +- src/xml/xml.pro | 2 +- 13 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 119cb234b6..c77bab8841 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -4,7 +4,7 @@ TARGET = QtConcurrent QT = core-private CONFIG += exceptions -DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 load(qt_module_config) diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index d825d2dad4..5ab0f54ce6 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -7,7 +7,7 @@ CONFIG += exceptions MODULE = core # not corelib, as per project file MODULE_CONFIG = moc resources -DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index d43265cfc7..c1e95e6443 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -5,8 +5,7 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -DEFINES += QT_BUILD_DBUS_LIB \ - DBUS_API_SUBJECT_TO_CHANGE +DEFINES += DBUS_API_SUBJECT_TO_CHANGE QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { LIBS_PRIVATE += $$QT_LIBS_DBUS diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 049b83116c..afb41bf2ec 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -4,7 +4,7 @@ TARGET = QtGui QT = core-private MODULE_CONFIG = opengl -DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE load(qt_module_config) diff --git a/src/network/network.pro b/src/network/network.pro index ffd5bd949a..c44263c894 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtNetwork QT = core-private -DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG #DEFINES += QNETWORKDISKCACHE_DEBUG #DEFINES += QSSLSOCKET_DEBUG diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 8c61ab23c8..953cabd43e 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -3,7 +3,6 @@ load(qt_module) TARGET = QtOpenGL QT = core-private gui-private widgets-private -DEFINES += QT_BUILD_OPENGL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 23d65b8f82..1e63a17408 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -5,8 +5,6 @@ QT = core-private gui-private CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon -DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB - load(qt_module_config) DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index cccd63939e..3e3312f5ca 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtPrintSupport QT = core-private gui-private widgets-private -DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE load(qt_module_config) diff --git a/src/sql/sql.pro b/src/sql/sql.pro index e5d32b0797..a0f5c11288 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -3,7 +3,6 @@ load(qt_module) TARGET = QtSql QT = core-private -DEFINES += QT_BUILD_SQL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index b567fe7c00..18d09ba162 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE #if !defined(QT_SHARED) && !defined(QT_DLL) # define Q_TESTLIB_EXPORT #else -# ifdef QTESTLIB_MAKEDLL +# ifdef QT_BUILD_TESTLIB_LIB # define Q_TESTLIB_EXPORT Q_DECL_EXPORT # else # define Q_TESTLIB_EXPORT Q_DECL_IMPORT diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 1d1849d406..8016680952 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -58,7 +58,6 @@ SOURCES = qtestcase.cpp \ qxunittestlogger.cpp DEFINES *= QT_NO_CAST_TO_ASCII \ QT_NO_CAST_FROM_ASCII \ - QTESTLIB_MAKEDLL \ QT_NO_DATASTREAM embedded:QMAKE_CXXFLAGS += -fno-rtti wince*::LIBS += libcmt.lib \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 79a266fb15..6494574d59 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -4,7 +4,7 @@ TARGET = QtWidgets QT = core-private gui-private MODULE_CONFIG = uic -DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 836e274bb6..1834feb210 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtXml QT = core-private -DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 load(qt_module_config) -- cgit v1.2.3 From 1ee462604b1ca981351b663c28d45472fcf7c6f2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 4 Jun 2012 17:10:11 +0200 Subject: fix misnomer: qt_module.prf => qt_build_config.prf qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953 --- src/concurrent/concurrent.pro | 2 +- 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/winmain/winmain.pro | 2 +- src/xml/xml.pro | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index c77bab8841..6b81950138 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtConcurrent QT = core-private diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 5ab0f54ce6..673d34b548 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtCore QT = diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index c1e95e6443..0360d654e6 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtDBus QT = core-private diff --git a/src/gui/gui.pro b/src/gui/gui.pro index afb41bf2ec..50dc41b8aa 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtGui QT = core-private diff --git a/src/network/network.pro b/src/network/network.pro index c44263c894..fc901da072 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtNetwork QT = core-private diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 953cabd43e..1649651ce7 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtOpenGL QT = core-private gui-private widgets-private diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 1e63a17408..e8ea981d6d 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtPlatformSupport QT = core-private gui-private diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index 3e3312f5ca..6dffbd83c8 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtPrintSupport QT = core-private gui-private widgets-private diff --git a/src/sql/sql.pro b/src/sql/sql.pro index a0f5c11288..319217013f 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtSql QT = core-private diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 8016680952..f77a611e25 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtTest QT = core-private diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 6494574d59..94ae7824a3 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtWidgets QT = core-private gui-private diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 6f27ce7381..e5aa8c49e2 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) # Additional Qt project file for qtmain lib on Windows !win32:error("$$_FILE_ is intended only for Windows!") diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 1834feb210..5f4d844ea5 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = QtXml QT = core-private -- cgit v1.2.3