Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  symbian - handle path being passed as part of filename in QTranslator
  Symbian - fix compile error when default configured

5 files changed, 57 insertions, 8 deletions

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 8c08760599..ca30db1974 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -405,13 +405,26 @@ bool QTranslator::load(const QString & filename, const QString & directory,
     Q_D(QTranslator);
     d->clear();
 
+    QString fname = filename;
     QString prefix;
     if (QFileInfo(filename).isRelative()) {
 #ifdef Q_OS_SYMBIAN
-        if (directory.isEmpty())
+        //TFindFile doesn't like path in the filename
+        QString dir(directory);
+        int slash = filename.lastIndexOf(QLatin1Char('/'));
+        slash = qMax(slash, filename.lastIndexOf(QLatin1Char('\\')));
+        if (slash >=0) {
+            //so move the path component into the directory prefix
+            if (dir.isEmpty())
+                dir = filename.left(slash + 1);
+            else
+                dir = dir + QLatin1Char('/') + filename.left(slash + 1);
+            fname = fname.mid(slash + 1);
+        }
+        if (dir.isEmpty())
             prefix = QCoreApplication::applicationDirPath();
         else
-            prefix = QFileInfo(directory).absoluteFilePath(); //TFindFile doesn't like dirty paths
+            prefix = QFileInfo(dir).absoluteFilePath(); //TFindFile doesn't like dirty paths
         if (prefix.length() > 2 && prefix.at(1) == QLatin1Char(':') && prefix.at(0).isLetter())
             prefix[0] = QLatin1Char('Y');
 #else
@@ -425,7 +438,6 @@ bool QTranslator::load(const QString & filename, const QString & directory,
     QString nativePrefix = QDir::toNativeSeparators(prefix);
 #endif
 
-    QString fname = filename;
     QString realname;
     QString delims;
     delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
diff --git a/src/gui/painting/qgraphicssystemex_symbian.cpp b/src/gui/painting/qgraphicssystemex_symbian.cpp
index 32e040fdc8..5a182ffc7f 100644
--- a/src/gui/painting/qgraphicssystemex_symbian.cpp
+++ b/src/gui/painting/qgraphicssystemex_symbian.cpp
@@ -46,7 +46,7 @@
 
 #include <e32property.h>
 
-#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL)
 #include "private/qegl_p.h"
 #endif
 
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 static bool bcm2727Initialized = false;
 static bool bcm2727 = false;
 
-#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL)
 typedef EGLBoolean (*NOK_resource_profiling)(EGLDisplay, EGLint, EGLint*, EGLint, EGLint*);
 #define EGL_PROF_TOTAL_MEMORY_NOK 0x3070
 #endif
@@ -69,7 +69,7 @@ bool QSymbianGraphicsSystemEx::hasBCM2727()
     if (bcm2727Initialized)
         return bcm2727;
 
-#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+#if defined(Q_SYMBIAN_SUPPORTS_SURFACES) && !defined (QT_NO_EGL)
     EGLDisplay display = QEgl::display();
 #if 1
     // Hacky but fast ~0ms.
diff --git a/tests/auto/qtranslator/i18n/hellotr_en.qm b/tests/auto/qtranslator/i18n/hellotr_en.qm
new file mode 100644
index 0000000000..cc42afe05c
--- /dev/null
+++ b/tests/auto/qtranslator/i18n/hellotr_en.qm
diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro
index 5b742f76e9..8ab1fd3eca 100644
--- a/tests/auto/qtranslator/qtranslator.pro
+++ b/tests/auto/qtranslator/qtranslator.pro
@@ -4,6 +4,7 @@ RESOURCES += qtranslator.qrc
 
 wince*|symbian: {
    addFiles.sources = hellotr_la.qm msgfmt_from_po.qm
+   addFiles.sources += i18n
    addFiles.path = .
    DEPLOYMENT += addFiles
 }
diff --git a/tests/auto/qtranslator/tst_qtranslator.cpp b/tests/auto/qtranslator/tst_qtranslator.cpp
index 8e2ed157a4..6f65e6a662 100644
--- a/tests/auto/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/qtranslator/tst_qtranslator.cpp
@@ -66,6 +66,10 @@ protected:
 private slots:
     void load();
     void load2();
+    void loadSubdir();
+    void loadSubdir2();
+    void loadSubdir3();
+    void loadSubdir4();
     void threadLoad();
     void testLanguageChange();
     void plural();
@@ -124,6 +128,38 @@ void tst_QTranslator::load2()
     QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!"));
 }
 
+void tst_QTranslator::loadSubdir()
+{
+    QTranslator tor( 0 );
+    tor.load("hellotr_en_GB", "i18n");
+    QVERIFY(!tor.isEmpty());
+    QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!"));
+}
+
+void tst_QTranslator::loadSubdir2()
+{
+    QTranslator tor( 0 );
+    tor.load("i18n/hellotr_en_GB");
+    QVERIFY(!tor.isEmpty());
+    QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!"));
+}
+
+void tst_QTranslator::loadSubdir3()
+{
+    QTranslator tor( 0 );
+    tor.load(QString(QLatin1String("i18n%1hellotr_en_GB")).arg(QDir::separator()));
+    QVERIFY(!tor.isEmpty());
+    QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!"));
+}
+
+void tst_QTranslator::loadSubdir4()
+{
+    QTranslator tor( 0 );
+    tor.load("./hellotr_en_GB", "i18n");
+    QVERIFY(!tor.isEmpty());
+    QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!"));
+}
+
 class TranslatorThread : public QThread
 {
     void run() {
@@ -249,10 +285,10 @@ void tst_QTranslator::loadFromResource()
 
 void tst_QTranslator::loadDirectory()
 {
-    QVERIFY(QFileInfo("../qtranslator").isDir());
+    QVERIFY(QFileInfo("i18n").isDir());
 
     QTranslator tor;
-    tor.load("qtranslator", "..");
+    tor.load("qtranslator", "i18n");
     QVERIFY(tor.isEmpty());
 }