diff options
Diffstat (limited to 'patches/0111-Make-sure-we-don-t-always-pull-in-modules-from-insta.patch')
| -rw-r--r-- | patches/0111-Make-sure-we-don-t-always-pull-in-modules-from-insta.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/0111-Make-sure-we-don-t-always-pull-in-modules-from-insta.patch b/patches/0111-Make-sure-we-don-t-always-pull-in-modules-from-insta.patch new file mode 100644 index 0000000..aad48f8 --- /dev/null +++ b/patches/0111-Make-sure-we-don-t-always-pull-in-modules-from-insta.patch @@ -0,0 +1,31 @@ +From 0e040e810c19da1c6d77d88c8c077b2f9791abe6 Mon Sep 17 00:00:00 2001 +From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> +Date: Wed, 30 Mar 2011 11:59:54 -0500 +Subject: [PATCH] Make sure we don't always pull in modules from installed mkspecs + +When building Qt, qmake should not pull in mkspecs from an installed +version, as this will lead to incorrect paths for the current build. + +So, here we ensure only to pull in modules from there we detected the +qconfig.pri, and ensure we still handle the QMAKEPATH case used by +some. +--- + qtbase/mkspecs/features/qt_config.prf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf +index 5afd82c..071bb6c 100644 +--- a/qtbase/mkspecs/features/qt_config.prf ++++ b/qtbase/mkspecs/features/qt_config.prf +@@ -12,7 +12,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { + } else { + debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") + for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \ +- $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) { ++ $$replace($$list($$split($$list($$(QMAKEPATH)), $$DIRLIST_SEPARATOR)), $, /mkspecs))))) { + debug(1, "Loading modules from $${dir}") + for(mod, $$list($$files($$dir/modules/qt_*.pri))) { + # For installed Qt these paths will be common for all modules +-- +1.7.3.2.343.g7d43d + |