OSDN Git Service
(root)
/
qt-creator-jp
/
qt-creator-jp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version bump
[qt-creator-jp/qt-creator-jp.git]
/
qtcreator.pri
diff --git
a/qtcreator.pri
b/qtcreator.pri
index
2994770
..
e4b262f
100644
(file)
--- a/
qtcreator.pri
+++ b/
qtcreator.pri
@@
-1,6
+1,8
@@
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1
!isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
QTCREATOR_PRI_INCLUDED = 1
+QTCREATOR_VERSION = 2.3.82
+
defineReplace(cleanPath) {
win32:1 ~= s|\\\\|/|g
contains(1, ^/.*):pfx = /
defineReplace(cleanPath) {
win32:1 ~= s|\\\\|/|g
contains(1, ^/.*):pfx = /
@@
-99,6
+101,11
@@
macx {
IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS
contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1
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
} else {
win32 {
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
@@
-116,12
+123,12
@@
macx {
}
INCLUDEPATH += \
}
INCLUDEPATH += \
+ $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
$$IDE_SOURCE_TREE/src/libs \
$$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
LIBS += -L$$IDE_LIBRARY_PATH
@@
-140,17
+147,7
@@
unix {
UI_DIR = $${OUT_PWD}/.uic
}
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
}
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