projects / profile / ivi / qtbase.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed compile error in eglfs plugin due to narrowing conversion.
[profile/ivi/qtbase.git] / qtbase.pro
diff --git a/qtbase.pro b/qtbase.pro
index d20e30d..5efe77e 100644 (file)
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -35,13 +35,10 @@ contains(PROJECTS, tests) {
     message(Unknown PROJECTS: $$PROJECTS)
 }
 
-!symbian: confclean.depends += clean
+confclean.depends += clean
 confclean.commands =
-unix:!symbian {
+unix {
   confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \
-                       (cd config.tests/unix/endian && $(MAKE) distclean); \
-                       (cd config.tests/unix/ipv6 && $(MAKE) distclean); \
-                       (cd config.tests/unix/largefile && $(MAKE) distclean); \
                        (cd config.tests/unix/ptrsize && $(MAKE) distclean); \
                        (cd config.tests/x11/notype && $(MAKE) distclean); \
                        (cd config.tests/unix/getaddrinfo && $(MAKE) distclean); \
@@ -50,7 +47,6 @@ unix:!symbian {
                        (cd config.tests/unix/mysql && $(MAKE) distclean); \
                        (cd config.tests/unix/mysql_r && $(MAKE) distclean); \
                        (cd config.tests/unix/nis && $(MAKE) distclean); \
-                       (cd config.tests/unix/nix && $(MAKE) distclean); \
                        (cd config.tests/unix/iodbc && $(MAKE) distclean); \
                        (cd config.tests/unix/odbc && $(MAKE) distclean); \
                        (cd config.tests/unix/oci && $(MAKE) distclean); \
@@ -59,7 +55,6 @@ unix:!symbian {
                        (cd config.tests/unix/ibase && $(MAKE) distclean); \
                        (cd config.tests/unix/ipv6ifname && $(MAKE) distclean); \
                        (cd config.tests/unix/zlib && $(MAKE) distclean); \
-                       (cd config.tests/unix/libmng && $(MAKE) distclean); \
                        (cd config.tests/unix/sqlite2 && $(MAKE) distclean); \
                        (cd config.tests/unix/libjpeg && $(MAKE) distclean); \
                        (cd config.tests/unix/libpng && $(MAKE) distclean); \
@@ -70,13 +65,14 @@ unix:!symbian {
                        (cd config.tests/x11/xinput && $(MAKE) distclean); \
                        (cd config.tests/x11/fontconfig && $(MAKE) distclean); \
                        (cd config.tests/x11/xinerama && $(MAKE) distclean); \
-                       (cd config.tests/x11/sm && $(MAKE) distclean); \
                        (cd config.tests/x11/xshape && $(MAKE) distclean); \
                        (cd config.tests/x11/opengl && $(MAKE) distclean); \
                         $(DEL_FILE) config.tests/.qmake.cache; \
                        $(DEL_FILE) src/corelib/global/qconfig.h; \
                        $(DEL_FILE) src/corelib/global/qconfig.cpp; \
                        $(DEL_FILE) mkspecs/qconfig.pri; \
+                       $(DEL_FILE) mkspecs/qdevice.pri; \
+                       $(DEL_FILE) mkspecs/qmodule.pri; \
                        $(DEL_FILE) .qmake.cache; \
                        (cd qmake && $(MAKE) distclean);
 }
@@ -84,33 +80,11 @@ 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\\qdevice.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)
 }
-symbian {
-  confclean.depends += distclean
-  contains(QMAKE_HOST.os, "Windows") {
-    confclean.commands += \
-            (cd src\\tools\\moc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
-            (cd src\\tools\\rcc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
-            (cd src\\tools\\uic && $(MAKE) distclean) $$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) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \
-            -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
-            (cd qmake && $(MAKE) distclean)
-  } else {
-    confclean.commands += \
-            (cd src/tools/moc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
-            (cd src/tools/rcc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
-            (cd src/tools/uic && $(MAKE) distclean) $$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) mkspecs/qconfig.pri $$escape_expand(\\n\\t) \
-            -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
-            (cd qmake && $(MAKE) distclean)
-  }
-}
 QMAKE_EXTRA_TARGETS += confclean
 qmakeclean.commands += (cd qmake && $(MAKE) clean)
 QMAKE_EXTRA_TARGETS += qmakeclean
@@ -121,37 +95,45 @@ CONFIG -= qt
 ### installations ####
 
 #qmake
-qmake.path=$$[QT_INSTALL_BINS]
+qmake.path = $$[QT_HOST_BINS]
 win32 {
-   qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
+   qmake.files = $$OUT_PWD/bin/qmake.exe
 } else {
-   qmake.files=$$QT_BUILD_TREE/bin/qmake
+   qmake.files = $$OUT_PWD/bin/qmake
 }
 INSTALLS += qmake
 
 #syncqt
-syncqt.path=$$[QT_INSTALL_BINS]
-syncqt.files=$$QT_BUILD_TREE/bin/syncqt
-win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat
+syncqt.path = $$[QT_HOST_BINS]
+syncqt.files = $$OUT_PWD/bin/syncqt
+win32:syncqt.files = $$OUT_PWD/bin/syncqt.bat
 INSTALLS += syncqt
 
 #qtmodule-configtests
-configtests.path=$$[QT_INSTALL_BINS]
-configtests.files=$$QT_BUILD_TREE/bin/qtmodule-configtests
+configtests.path = $$[QT_HOST_BINS]
+configtests.files = $$PWD/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/*)
-mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
+mkspecs.path = $$[QT_HOST_DATA]/mkspecs
+mkspecs.files = $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri $$files($$PWD/mkspecs/*)
+mkspecs.files -= $$PWD/mkspecs/modules
 unix { 
    DEFAULT_QMAKESPEC = $$QMAKESPEC
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
-   mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default
+   mkspecs.files -= $$PWD/mkspecs/default
 }
-win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
+win32:!equals(OUT_PWD, $$PWD) {
     # When shadow building on Windows, the default mkspec only exists in the build tree.
-    mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+    mkspecs.files += $$OUT_PWD/mkspecs/default
 }
 INSTALLS += mkspecs
+
+OTHER_FILES += \
+    configure \
+    header.BSD \
+    header.FDL \
+    header.LGPL \
+    header.LGPL-ONLY \
+    sync.profile
Domain: UI Framework / Uncategorized;