From 080e0a369932323d9f14224bca8922e4abb3ebfb Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 7 Oct 2009 16:42:09 +0200
Subject: With an embedded linux licence you should also be able to use the Qt
Windows version for development.
This used to work before 4.5.1
Task-number:Qt-704
Reviewed-by:thiago
---
configure.exe | Bin 1168896 -> 2362880 bytes
tools/configure/tools.cpp | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.exe b/configure.exe
index aa254f3..838889c 100755
Binary files a/configure.exe and b/configure.exe differ
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";
--
cgit v0.12
From 843bb5cb6dfb1a17454fe3cebb599377884ce00e Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Wed, 7 Oct 2009 16:55:22 +0200
Subject: Revert "Fix tst_QTextLayout::testTabDPIScale"
This reverts commit bf8d74bb8e849cb9eea74ef8fdb82d8926c48880.
Breaks more cases than it actually fixes.
modified: tests/auto/qtextlayout/tst_qtextlayout.cpp
---
tests/auto/qtextlayout/tst_qtextlayout.cpp | 5 -----
1 file changed, 5 deletions(-)
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=
--
cgit v0.12