From 23b493e2af7b4851e96f5a942143685fcef06ea5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 Jun 2010 15:50:43 +0200 Subject: double-quote string which contains a single-quote qmake is just too forgiving ... --- src/qbase.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qbase.pri b/src/qbase.pri index 6f2dfa4..59beaab 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 -- cgit v0.12 From 4b5c82f0aa8dc66bd21b2ccb98dff0ad5650fde9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Jun 2010 18:09:55 +0200 Subject: propagate code change back to .g source missed that in 60acaf5e --- tools/linguist/lupdate/qscript.g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index a473500..5445a64 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); } -- cgit v0.12