diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-25 10:45:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-25 10:45:58 +0200 |
| commit | 0a1bdf425786b8df6a399a181ee692fc0b4e9e98 (patch) | |
| tree | c0a6ebb7083f3e49440a5eaa9dd7c9857e006ee1 /qtcreator.pri | |
| parent | b9e21803d603c268328d0732cfa863ac3845620b (diff) | |
| parent | becdcdc4f4c6c30e72e30c726c657a796a499b3b (diff) | |
| download | qt-creator-0a1bdf425786b8df6a399a181ee692fc0b4e9e98.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
tests/auto/icheckbuild/icheckbuild.pro
Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 6641479319..44366628c2 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -72,6 +72,8 @@ 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_)) @@ -79,6 +81,8 @@ defineReplace(stripSrcDir) { } else { # qt5 +QTESTLIB = qtestlib + # For use in custom compilers which just copy files win32:i_flag = i defineReplace(stripSrcDir) { |