Merge remote-tracking branch 'origin/2.2'

[qt-creator-jp/qt-creator-jp.git] / qtcreator.pri

diff --git a/qtcreator.pri b/qtcreator.pri
index dfae8f9..2d6bf5b 100644 (file)
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -1,3 +1,8 @@
+!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
+QTCREATOR_PRI_INCLUDED = 1
+
+QTCREATOR_VERSION = 2.2.81
+
 defineReplace(cleanPath) {
     win32:1 ~= s|\\\\|/|g
     contains(1, ^/.*):pfx = /
@@ -15,6 +20,39 @@ defineReplace(targetPath) {
     return($$replace(1, /, $$QMAKE_DIR_SEP))
 }
 
+defineReplace(qtLibraryName) {
+   unset(LIBRARY_NAME)
+   LIBRARY_NAME = $$1
+   CONFIG(debug, debug|release) {
+      !debug_and_release|build_pass {
+          mac:RET = $$member(LIBRARY_NAME, 0)_debug
+              else:win32:RET = $$member(LIBRARY_NAME, 0)d
+      }
+   }
+   isEmpty(RET):RET = $$LIBRARY_NAME
+   return($$RET)
+}
+
+defineTest(minQtVersion) {
+    maj = $$1
+    min = $$2
+    patch = $$3
+    isEqual(QT_MAJOR_VERSION, $$maj) {
+        isEqual(QT_MINOR_VERSION, $$min) {
+            isEqual(QT_PATCH_VERSION, $$patch) {
+                return(true)
+            }
+            greaterThan(QT_PATCH_VERSION, $$patch) {
+                return(true)
+            }
+        }
+        greaterThan(QT_MINOR_VERSION, $$min) {
+            return(true)
+        }
+    }
+    return(false)
+}
+
 # For use in custom compilers which just copy files
 win32:i_flag = i
 defineReplace(stripSrcDir) {
@@ -60,8 +98,14 @@ macx {
     IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
     IDE_DATA_PATH    = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
     IDE_DOC_PATH     = $$IDE_DATA_PATH/doc
+    IDE_BIN_PATH     = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS
     contains(QT_CONFIG, ppc):CONFIG += ppc x86
     copydata = 1
+    isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QTC_TIGER_COMPAT)
+    isEmpty(TIGER_COMPAT_MODE) {
+        QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
+        QMAKE_LFLAGS *= -mmacosx-version-min=10.5
+    }
 } else {
     win32 {
         contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
@@ -74,16 +118,16 @@ macx {
     IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
     IDE_DATA_PATH    = $$IDE_BUILD_TREE/share/qtcreator
     IDE_DOC_PATH     = $$IDE_BUILD_TREE/share/doc/qtcreator
+    IDE_BIN_PATH     = $$IDE_APP_PATH
     !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
 }
 
 INCLUDEPATH += \
     $$IDE_SOURCE_TREE/src/libs \
-    $$IDE_SOURCE_TREE/tools
+    $$IDE_SOURCE_TREE/tools \
+    $$IDE_SOURCE_TREE/src/plugins
 
-DEPENDPATH += \
-    $$IDE_SOURCE_TREE/src/libs \
-    $$IDE_SOURCE_TREE/tools
+CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
 
@@ -102,17 +146,7 @@ unix {
     UI_DIR = $${OUT_PWD}/.uic
 }
 
-linux-g++-* {
-    # Bail out on non-selfcontained libraries. Just a security measure
-    # to prevent checking in code that does not compile on other platforms.
-    QMAKE_LFLAGS += -Wl,--allow-shlib-undefined -Wl,--no-undefined
-}
-
 win32-msvc* { 
     #Don't warn about sprintf, fopen etc being 'unsafe'
     DEFINES += _CRT_SECURE_NO_WARNINGS
 }
-
-# Handle S60 support: default on Windows, conditionally built on other platforms.
-macx:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
-else:SUPPORT_QT_S60=1