diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-17 14:22:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-17 14:22:32 +0200 |
| commit | 8eb8368139b08064bf3340fe1df4ddc74ae6b44d (patch) | |
| tree | 3731efd8103cb1703321eed007574be12475a2ea /qtcreator.pri | |
| parent | 4ea9c2193210d2ce87722085aa4ad7cc3057c405 (diff) | |
| parent | a9eb880353ce6b07bab5b57b0663fbe714066907 (diff) | |
| download | qt-creator-8eb8368139b08064bf3340fe1df4ddc74ae6b44d.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 07569c7551..3c92878089 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -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 |