Avoid fontconfig access in fontEngine creation

[profile/ivi/qtbase.git] / qtbase.pro

diff --git a/qtbase.pro b/qtbase.pro
index 375308a..d20e30d 100644 (file)
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -10,26 +10,30 @@ cross_compile: CONFIG += nostrip
 module_qtbase_tests.subdir = tests
 module_qtbase_tests.target = module-qtbase-tests
 module_qtbase_tests.depends = module_qtbase_src
-module_qtbase_tests.CONFIG = no_default_target no_default_install
+module_qtbase_tests.CONFIG = no_default_install
 
 #process the projects
-for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
-    isEqual(PROJECT, examples) {
-       SUBDIRS += examples
-    } else:isEqual(PROJECT, demos) {
-       SUBDIRS += demos
-    } else:isEqual(PROJECT, tests) {
-       module_qtbase_tests.CONFIG -= no_default_target
-    } else:isEqual(PROJECT, libs) {
-       include(src/src.pro)
-    } else:isEqual(PROJECT, qmake) {
-#      SUBDIRS += qmake
-    } else {
-       message(Unknown PROJECT: $$PROJECT)
-    }
+PROJECTS=$$eval($$list($$lower($$unique(QT_BUILD_PARTS))))
+# note that the order matters for these blocks!
+contains(PROJECTS, qmake) {
+    PROJECTS -= qmake
+    # nothing to be done
+}
+contains(PROJECTS, libs) {
+    PROJECTS -= libs
+    include(src/src.pro)
+}
+contains(PROJECTS, examples) {
+    PROJECTS -= examples
+    SUBDIRS += examples
+}
+contains(PROJECTS, tests) {
+    PROJECTS -= tests
+    SUBDIRS += module_qtbase_tests
+}
+!isEmpty(PROJECTS) {
+    message(Unknown PROJECTS: $$PROJECTS)
 }
-
-SUBDIRS += module_qtbase_tests
 
 !symbian: confclean.depends += clean
 confclean.commands =
@@ -70,15 +74,15 @@ unix:!symbian {
                        (cd config.tests/x11/xshape && $(MAKE) distclean); \
                        (cd config.tests/x11/opengl && $(MAKE) distclean); \
                         $(DEL_FILE) config.tests/.qmake.cache; \
-                       $(DEL_FILE) src/core/global/qconfig.h; \
-                       $(DEL_FILE) src/core/global/qconfig.cpp; \
+                       $(DEL_FILE) src/corelib/global/qconfig.h; \
+                       $(DEL_FILE) src/corelib/global/qconfig.cpp; \
                        $(DEL_FILE) mkspecs/qconfig.pri; \
                        $(DEL_FILE) .qmake.cache; \
                        (cd qmake && $(MAKE) distclean);
 }
 win32 {
-  confclean.commands += -$(DEL_FILE) src\\core\\global\\qconfig.h $$escape_expand(\\n\\t) \
-                       -$(DEL_FILE) src\\core\\global\\qconfig.cpp $$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) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \
                        -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
                        (cd qmake && $(MAKE) distclean)
@@ -131,6 +135,11 @@ syncqt.files=$$QT_BUILD_TREE/bin/syncqt
 win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat
 INSTALLS += syncqt
 
+#qtmodule-configtests
+configtests.path=$$[QT_INSTALL_BINS]
+configtests.files=$$QT_BUILD_TREE/bin/qtmodule-configtests
+INSTALLS += configtests
+
 #mkspecs
 mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs
 mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*)