Avoid fontconfig access in fontEngine creation

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

diff --git a/qtbase.pro b/qtbase.pro
index ecbb183..d20e30d 100644 (file)
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -74,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)
@@ -135,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/*)