diff options
| author | ninerider <qt-info@nokia.com> | 2009-10-07 14:59:27 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-10-07 14:59:27 (GMT) |
| commit | 883b0828d3a9c407d4f3088f9c63a7c8094927ca (patch) | |
| tree | a4b67b776394f18457d79e89560d8a7cc64106bb | |
| parent | de0635e254b3d4641dc0c42f7cee96596dbeb648 (diff) | |
| parent | 843bb5cb6dfb1a17454fe3cebb599377884ce00e (diff) | |
| download | Qt-883b0828d3a9c407d4f3088f9c63a7c8094927ca.zip Qt-883b0828d3a9c407d4f3088f9c63a7c8094927ca.tar.gz Qt-883b0828d3a9c407d4f3088f9c63a7c8094927ca.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
| -rwxr-xr-x | configure.exe | bin | 1168896 -> 2362880 bytes | |||
| -rw-r--r-- | tests/auto/qtextlayout/tst_qtextlayout.cpp | 5 | ||||
| -rw-r--r-- | tools/configure/tools.cpp | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex aa254f3..838889c 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index f63742a..5ccae94 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -55,12 +55,7 @@ #include <qdebug.h> -// Same font point size values as in QFont::QFont(..) -#ifdef Q_OS_SYMBIAN -#define TESTFONT_SIZE 7 -#else #define TESTFONT_SIZE 12 -#endif //TESTED_CLASS= //TESTED_FILES= diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 0d170f5..c958dd9 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -152,7 +152,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString if (platforms == 'X') { dictionary["LICENSE_EXTENSION"] = "-ALLOS"; - } else if (strchr("3679ACDEHJKMSUWX", platforms)) { + } else if (strchr("2346789ABCDEGHJKMPQSTUVWX", platforms)) { dictionary["LICENSE_EXTENSION"] = "-EMBEDDED"; } else if (strchr("4BFPQRTY", platforms)) { dictionary["LICENSE_EXTENSION"] = "-DESKTOP"; |