Commit a25d0ef3 authored by Rohan McGovern's avatar Rohan McGovern Committed by Qt by Nokia
Browse files

Ensure qmodule.pri is installed.

From the commit message of 0b2ce852

 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: default avatarJyri Tahtela <jyri.tahtela@nokia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent ce4343a5
No related merge requests found
Showing with 5 additions and 1 deletion
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment