diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
| commit | 81cce8902ee0383c57d90792e5dd52fe5d7f0b84 (patch) | |
| tree | 0ff6facd20b82a61803b1f8d22d3576aa0016469 /qtcreator.pri | |
| parent | 2ee0b36342446dd8816480d849138496321b154a (diff) | |
| parent | 5dcf7d2ef03827329e2d57ac33ac391abf278d57 (diff) | |
| download | qt-creator-81cce8902ee0383c57d90792e5dd52fe5d7f0b84.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 07569c7551..e7a942be75 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -76,8 +76,6 @@ isEmpty(IDE_LIBRARY_BASENAME) { IDE_LIBRARY_BASENAME = lib } -DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" - equals(TEST, 1) { QT +=testlib DEFINES += WITH_TESTS @@ -107,12 +105,8 @@ macx { QMAKE_LFLAGS *= -mmacosx-version-min=10.5 } } else { - win32 { - contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 - IDE_APP_TARGET = qtcreator - } else { - IDE_APP_TARGET = qtcreator - } + contains(TEMPLATE, vc.*):vcproj = 1 + IDE_APP_TARGET = qtcreator IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME @@ -132,6 +126,12 @@ CONFIG += depend_includepath LIBS += -L$$IDE_LIBRARY_PATH +!isEmpty(vcproj) { + DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\" +} else { + DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" +} + #DEFINES += QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_CAST_TO_ASCII !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION |