diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-09 11:20:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-09 11:20:10 +0100 |
| commit | fe74a9a722e50b16b7f3f73ae96fb891f8613c3c (patch) | |
| tree | 218f6f25240499ee2f7138332c7b73d76df6c2dd /qtcreator.pri | |
| parent | b03ba2bdb1ca4e96fa8be5da5c53fe48d8393c6f (diff) | |
| parent | 28bcc5634c2521d514fdae7dc05585dc20c1bde6 (diff) | |
| download | qt-creator-fe74a9a722e50b16b7f3f73ae96fb891f8613c3c.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/fakevim/fakevimhandler.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/cxx11/cxx11.pro
tests/auto/cplusplus/cxx11/tst_cxx11.cpp
tests/auto/icheckbuild/icheckbuild.pro
Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 44366628c2..6641479319 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -72,8 +72,6 @@ defineTest(minQtVersion) { isEqual(QT_MAJOR_VERSION, 5) { -QTESTLIB = testlib - # For use in custom compilers which just copy files defineReplace(stripSrcDir) { return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) @@ -81,8 +79,6 @@ defineReplace(stripSrcDir) { } else { # qt5 -QTESTLIB = qtestlib - # For use in custom compilers which just copy files win32:i_flag = i defineReplace(stripSrcDir) { |