diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 18:11:50 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 18:11:50 +0200 |
| commit | d3c3ed147f67c8f1e9c630a4f2087dac8f52cc7e (patch) | |
| tree | e0fad8056ffa1c08854ca04418e2bde90d44acc1 | |
| parent | 4fdffd678edd1dcb668f5d2a42d2b6cffb991d64 (diff) | |
| parent | 4b5c82f0aa8dc66bd21b2ccb98dff0ad5650fde9 (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
propagate code change back to .g source
double-quote string which contains a single-quote
| -rw-r--r-- | src/qbase.pri | 2 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qscript.g | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 6f2dfa4529..59beaab45e 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 diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index a473500ad5..5445a648da 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -106,7 +106,7 @@ static void recordMessage( fileName, lineNo, QStringList(), TranslatorMessage::Unfinished, plural); msg.setExtraComment(extracomment.simplified()); - tor->replace(msg); + tor->extend(msg); } |