AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure qmodule.pri is installed.

Browse Source 
From the commit message of 0b2ce85200 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 <jyri.tahtela@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Rohan McGovern 2011-11-22 16:58:30 +10:00 committed by Qt by Nokia
parent ce4343a52f
commit a25d0ef3c2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qtbase.pro
View File

@ -77,6 +77,7 @@ unix:!symbian {
$(DEL_FILE) src/corelib/global/qconfig.h; \ $(DEL_FILE) src/corelib/global/qconfig.h; \
$(DEL_FILE) src/corelib/global/qconfig.cpp; \ $(DEL_FILE) src/corelib/global/qconfig.cpp; \
$(DEL_FILE) mkspecs/qconfig.pri; \ $(DEL_FILE) mkspecs/qconfig.pri; \
$(DEL_FILE) mkspecs/qmodule.pri; \
$(DEL_FILE) .qmake.cache; \ $(DEL_FILE) .qmake.cache; \
(cd qmake && $(MAKE) distclean); (cd qmake && $(MAKE) distclean);
} }
@ -84,6 +85,7 @@ win32 {
confclean.commands += -$(DEL_FILE) src\\corelib\\global\\qconfig.h $$escape_expand(\\n\\t) \ 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) src\\corelib\\global\\qconfig.cpp $$escape_expand(\\n\\t) \
-$(DEL_FILE) mkspecs\\qconfig.pri $$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) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
(cd qmake && $(MAKE) distclean) (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.h $$escape_expand(\\n\\t) \
-$(DEL_FILE) src\\corelib\\global\\qconfig.cpp $$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\\qconfig.pri $$escape_expand(\\n\\t) \
-$(DEL_FILE) mkspecs\\qmodule.pri $$escape_expand(\\n\\t) \
-$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
(cd qmake && $(MAKE) distclean) (cd qmake && $(MAKE) distclean)
} else { } else {
@ -107,6 +110,7 @@ symbian {
-$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\\n\\t) \ -$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\\n\\t) \
-$(DEL_FILE) src/corelib/global/qconfig.cpp $$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/qconfig.pri $$escape_expand(\\n\\t) \
-$(DEL_FILE) mkspecs/qmodule.pri $$escape_expand(\\n\\t) \
-$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \ -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
(cd qmake && $(MAKE) distclean) (cd qmake && $(MAKE) distclean)
} }
@ -142,7 +146,7 @@ INSTALLS += configtests
#mkspecs #mkspecs
mkspecs.path=$$[QT_INSTALL_DATA]/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 mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
unix { unix {
DEFAULT_QMAKESPEC = $$QMAKESPEC DEFAULT_QMAKESPEC = $$QMAKESPEC