Debugger: Enable stack frames without an annotated function

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

diff --git a/qtcreator.pri b/qtcreator.pri
index ce9e3f9..6668a78 100644 (file)
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -1,7 +1,7 @@
 !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
 QTCREATOR_PRI_INCLUDED = 1
 
-QTCREATOR_VERSION = 2.2.81
+QTCREATOR_VERSION = 2.3.82
 
 defineReplace(cleanPath) {
     win32:1 ~= s|\\\\|/|g
@@ -75,8 +75,11 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
 isEmpty(IDE_LIBRARY_BASENAME) {
     IDE_LIBRARY_BASENAME = lib
 }
-
-DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+win32-msvc* {
+    DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
+} else {
+    DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+}
 
 equals(TEST, 1) {
     QT +=testlib
@@ -123,14 +126,12 @@ macx {
 }
 
 INCLUDEPATH += \
+    $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
     $$IDE_SOURCE_TREE/src/libs \
     $$IDE_SOURCE_TREE/tools \
     $$IDE_SOURCE_TREE/src/plugins
 
-DEPENDPATH += \
-    $$IDE_SOURCE_TREE/src/libs \
-    $$IDE_SOURCE_TREE/tools \
-    $$IDE_SOURCE_TREE/src/plugins
+CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
 
@@ -149,17 +150,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