diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 18:47:57 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 18:47:57 (GMT) |
| commit | d7d55ab51381f5805d52523d98623e63a99db2cf (patch) | |
| tree | 5b760b92f84bdb2137fe7d53e16d78c0693fd2f4 /src/qbase.pri | |
| parent | c5de4176dac960d8f7c6d2d77b0d8bf3c7311da9 (diff) | |
| parent | 2ae808a23ce05bf9768ad9df107c16bb0c555ee7 (diff) | |
| download | Qt-d7d55ab51381f5805d52523d98623e63a99db2cf.zip Qt-d7d55ab51381f5805d52523d98623e63a99db2cf.tar.gz Qt-d7d55ab51381f5805d52523d98623e63a99db2cf.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'src/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 9c4732e..d2137d0 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -1,4 +1,4 @@ -isEmpty(TARGET):error(You must set TARGET before include()'ing $${_FILE_}) +isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 |