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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
  Avoid possible font name collisions on fbserv
  Update of Czech translation for Qt 4.7-stable
  Fix crash in QtScript/JSC stack allocator on Symbian
  HTTP: fix digest authentication
  Fix loop count in animanted gifs sometimes being incorrect
  Fixed UTF-8 application names in device application menu in Symbian
  Validate arguments to QDBusConnection::connect
  make the test a bit stricter
  ignore the warning from auto-detach in destructor
  get rid of extra calls to handle()
  simplify QSharedMemory::detach()
  avoid extra calculations
  fix error reporting on detach()
  fix error reporting
  Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
  Fix to pen state handling in OpenVG paint engine.
  BorderImage fails for .sci source containing a URL
  positionViewAtIndex can fail when positioned near end of list.
  Revert "Fix loaded() signal to be emitted only once"
  Revert "don't include harfbuzz where we don't use it"
  ...

4 files changed, 19 insertions, 7 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0c172e8..64fc6a9 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1029,6 +1029,8 @@ void Configure::parseCmdLine()
                     QString("\\resource\\qt%1\\plugins").arg(dictionary[ "QT_LIBINFIX" ]);
                 dictionary[ "QT_INSTALL_IMPORTS" ] =
                     QString("\\resource\\qt%1\\imports").arg(dictionary[ "QT_LIBINFIX" ]);
+                dictionary[ "QT_INSTALL_TRANSLATIONS" ] =
+                    QString("\\resource\\qt%1\\translations").arg(dictionary[ "QT_LIBINFIX" ]);
             }
         } else if (configCmdLine.at(i) == "-D") {
             ++i;
@@ -3449,8 +3451,12 @@ void Configure::displayConfig()
             webkit = "yes (debug)";
         cout << "WebKit support.............." << webkit << endl;
     }
-    cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl;
-    cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
+    {
+        QString declarative = dictionary[ "DECLARATIVE" ];
+        cout << "Declarative support........." << declarative << endl;
+        if (declarative == "yes")
+            cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
+    }
     cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
     cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
     cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl;
@@ -3581,7 +3587,11 @@ void Configure::generateHeaders()
         QStringList env;
         env += QString("QTDIR=" + sourcePath);
         env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
-        Environment::execute(args, env, QStringList());
+        int retc = Environment::execute(args, env, QStringList());
+        if (retc) {
+            cout << "syncqt failed, return code " << retc << endl << endl;
+            dictionary["DONE"] = "error";
+        }
     }
 }
 
diff --git a/tools/linguist/lupdate/qscript.cpp b/tools/linguist/lupdate/qscript.cpp
index 1ff7e1c..e53c9dc 100644
--- a/tools/linguist/lupdate/qscript.cpp
+++ b/tools/linguist/lupdate/qscript.cpp
@@ -1530,7 +1530,7 @@ int QScript::Lexer::lex()
                 } else {
                     setDone(Bad);
                     err = IllegalEscapeSequence;
-                    errmsg = LU::tr("Illegal escape squence");
+                    errmsg = LU::tr("Illegal escape sequence");
                 }
             } else if (current == 'x')
                 state = InHexEscape;
diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g
index 66ec2c7..b8b7b5f 100644
--- a/tools/linguist/lupdate/qscript.g
+++ b/tools/linguist/lupdate/qscript.g
@@ -861,7 +861,7 @@ int QScript::Lexer::lex()
                 } else {
                     setDone(Bad);
                     err = IllegalEscapeSequence;
-                    errmsg = LU::tr("Illegal escape squence");
+                    errmsg = LU::tr("Illegal escape sequence");
                 }
             } else if (current == 'x')
                 state = InHexEscape;
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 74a7b5f..c91a916 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -112,9 +112,11 @@ public:
 
     void writePNG(const QImage& image)
     {
-#ifndef QT_LINUXBASE
+#if !defined(QT_LINUXBASE) && \
+    (PNG_LIBPNG_VER_MAJOR < 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR <= 4))
         // LSB disallows accessing the info_ptr directly. LSB's png_set_IHDR sets
-        // the channels anyways, so just comment it out for LSB usage
+        // the channels anyways, so just comment it out for LSB usage.
+        // In libpng >= 1.5, the png_info struct is no longer exported.
         info_ptr->channels = 4;
 #endif
         png_set_sig_bytes(png_ptr, 8); // Pretend we already wrote the sig