From a25d0ef3c24286602f7d9e80206b37f8ada7ac04 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 22 Nov 2011 16:58:30 +1000 Subject: Ensure qmodule.pri is installed. From the commit message of 0b2ce8520020a0db9b5b5feb5e72f64518d3eea5 and the code in qt_module.prf, it is apparently intended that qmodule.pri is installed, but this was never implemented correctly. Make sure we install it. This has gone unnoticed because it happens to be installed by accident unless $$QT_SOURCE_TREE != $$QT_BUILD_TREE and $$QT_BUILD_TREE != $$[QT_INSTALL_PREFIX] (i.e. a shadow build which is not using -developer-build). Change-Id: Iee861a7bb592ca43a61ad91f1ef6a7a5bd21aff8 Reviewed-by: Jyri Tahtela Reviewed-by: Oswald Buddenhagen --- qtbase.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qtbase.pro b/qtbase.pro index d20e30d843..b1a096f66a 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -77,6 +77,7 @@ unix:!symbian { $(DEL_FILE) src/corelib/global/qconfig.h; \ $(DEL_FILE) src/corelib/global/qconfig.cpp; \ $(DEL_FILE) mkspecs/qconfig.pri; \ + $(DEL_FILE) mkspecs/qmodule.pri; \ $(DEL_FILE) .qmake.cache; \ (cd qmake && $(MAKE) distclean); } @@ -84,6 +85,7 @@ win32 { confclean.commands += -$(DEL_FILE) src\\corelib\\global\\qconfig.h $$escape_expand(\\n\\t) \ -$(DEL_FILE) src\\corelib\\global\\qconfig.cpp $$escape_expand(\\n\\t) \ -$(DEL_FILE) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \ + -$(DEL_FILE) mkspecs\\qmodule.pri $$escape_expand(\\n\\t) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \ (cd qmake && $(MAKE) distclean) } @@ -97,6 +99,7 @@ symbian { -$(DEL_FILE) src\\corelib\\global\\qconfig.h $$escape_expand(\\n\\t) \ -$(DEL_FILE) src\\corelib\\global\\qconfig.cpp $$escape_expand(\\n\\t) \ -$(DEL_FILE) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \ + -$(DEL_FILE) mkspecs\\qmodule.pri $$escape_expand(\\n\\t) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \ (cd qmake && $(MAKE) distclean) } else { @@ -107,6 +110,7 @@ symbian { -$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\\n\\t) \ -$(DEL_FILE) src/corelib/global/qconfig.cpp $$escape_expand(\\n\\t) \ -$(DEL_FILE) mkspecs/qconfig.pri $$escape_expand(\\n\\t) \ + -$(DEL_FILE) mkspecs/qmodule.pri $$escape_expand(\\n\\t) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \ (cd qmake && $(MAKE) distclean) } @@ -142,7 +146,7 @@ INSTALLS += configtests #mkspecs mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs -mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*) +mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_BUILD_TREE/mkspecs/qmodule.pri $$files($$QT_SOURCE_TREE/mkspecs/*) mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules unix { DEFAULT_QMAKESPEC = $$QMAKESPEC -- cgit v1.2.3