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/widgets/widgets.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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/widgets/widgets.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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 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/widgets/widgets.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/widgets') 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/widgets/widgets.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 1 - 1 file changed, 1 deletion(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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 -- 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/widgets/widgets.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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 -- cgit v1.2.3