diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 04:41:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-22 04:41:04 (GMT) |
| commit | ba9caa7181282109ea8def0994838b6538da0b13 (patch) | |
| tree | f1ae3f595fe6f601ce411d69179d6c0c8c650386 /tools/linguist | |
| parent | 2575eac4c26ad92dde95959a82f576edc3e76e1d (diff) | |
| parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
| download | Qt-ba9caa7181282109ea8def0994838b6538da0b13.zip Qt-ba9caa7181282109ea8def0994838b6538da0b13.tar.gz Qt-ba9caa7181282109ea8def0994838b6538da0b13.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/tools/tools.pri
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/linguist/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | tools/linguist/lupdate/java.cpp | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp index 5157fbe..921b8b6 100644 --- a/tools/linguist/linguist/mainwindow.cpp +++ b/tools/linguist/linguist/mainwindow.cpp @@ -1342,17 +1342,13 @@ void MainWindow::about() QString version = tr("Version %1"); version = version.arg(QLatin1String(QT_VERSION_STR)); - // TODO: Remove this variable for 4.6.0. Must keep this way for 4.5.x due to string freeze. - QString edition; - box.setText(tr("<center><img src=\":/images/splash.png\"/></img><p>%1</p></center>" "<p>Qt Linguist is a tool for adding translations to Qt " "applications.</p>" - "<p>%2</p>" "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)." "</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND," " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A" - " PARTICULAR PURPOSE.</p>").arg(version).arg(edition)); + " PARTICULAR PURPOSE.</p>").arg(version)); box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist")); box.setIcon(QMessageBox::NoIcon); diff --git a/tools/linguist/lupdate/java.cpp b/tools/linguist/lupdate/java.cpp index c8dbe5b..31024f9 100644 --- a/tools/linguist/lupdate/java.cpp +++ b/tools/linguist/lupdate/java.cpp @@ -60,7 +60,7 @@ enum { Tok_Eof, Tok_class, Tok_return, Tok_tr, Tok_Comment, Tok_String, Tok_Colon, Tok_Dot, Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen, Tok_RightParen, Tok_Comma, Tok_Semicolon, - Tok_Integer, Tok_Plus, Tok_PlusPlus, Tok_PlusEq }; + Tok_Integer, Tok_Plus, Tok_PlusPlus, Tok_PlusEq, Tok_null }; class Scope { @@ -144,7 +144,11 @@ static int getToken() case 'c': if ( yyIdent == QLatin1String("class") ) return Tok_class; - break; + break; + case 'n': + if ( yyIdent == QLatin1String("null") ) + return Tok_null; + break; } } switch ( yyIdent.at(0).toLatin1() ) { @@ -384,9 +388,11 @@ static bool matchInteger( qlonglong *number) static bool matchStringOrNull(QString &s) { bool matches = matchString(s); - qlonglong num = 0; - if (!matches) matches = matchInteger(&num); - return matches && num == 0; + if (!matches) { + matches = (yyTok == Tok_null); + if (matches) yyTok = getToken(); + } + return matches; } /* |