Merge remote branch 'origin/4.7' into master-from-4.7

Conflicts:
	doc/src/snippets/code/doc_src_qmake-manual.qdoc
	src/corelib/arch/symbian/arch.pri
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
	tests/auto/qfontmetrics/tst_qfontmetrics.cpp

12 files changed, 40 insertions, 23 deletions

diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp
index 1046e56..7abbad1 100644
--- a/tools/assistant/tools/qcollectiongenerator/main.cpp
+++ b/tools/assistant/tools/qcollectiongenerator/main.cpp
@@ -363,6 +363,7 @@ int main(int argc, char *argv[])
     bool showVersion = false;
 
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QTranslator qt_helpTranslator;
@@ -375,6 +376,7 @@ int main(int argc, char *argv[])
         app.installTranslator(&qtTranslator);
         app.installTranslator(&qt_helpTranslator);
     }
+#endif // Q_OS_WIN32
 
     for (int i=1; i<argc; ++i) {
         arg = QString::fromLocal8Bit(argv[i]);
diff --git a/tools/assistant/tools/qhelpgenerator/main.cpp b/tools/assistant/tools/qhelpgenerator/main.cpp
index 637786c..5e20b4e 100644
--- a/tools/assistant/tools/qhelpgenerator/main.cpp
+++ b/tools/assistant/tools/qhelpgenerator/main.cpp
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
     bool checkLinks = false;
 
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QTranslator qt_helpTranslator;
@@ -80,6 +81,7 @@ int main(int argc, char *argv[])
         app.installTranslator(&qtTranslator);
         app.installTranslator(&qt_helpTranslator);
     }
+#endif // Q_OS_WIN32
 
     for (int i = 1; i < argc; ++i) {
         arg = QString::fromLocal8Bit(argv[i]);
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index d691548..2e397ad 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -140,6 +140,7 @@ struct File
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
@@ -149,6 +150,7 @@ int main(int argc, char *argv[])
         app.installTranslator(&translator);
         app.installTranslator(&qtTranslator);
     }
+#endif // Q_OS_WIN32
 
     QStringList args = app.arguments();
     QList<File> inFiles;
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 19377ef..5e6edb4 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -191,6 +191,7 @@ int main(int argc, char **argv)
             );
 #else
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
@@ -200,7 +201,8 @@ int main(int argc, char **argv)
         app.installTranslator(&translator);
         app.installTranslator(&qtTranslator);
     }
-#endif
+#endif // Q_OS_WIN32
+#endif // QT_BOOTSTRAPPED
 
     ConversionData cd;
     cd.m_verbose = true; // the default is true starting with Qt 4.2
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index d96e205..49906e0 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -412,6 +412,7 @@ static void processProjects(
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
+#ifndef Q_OS_WIN32
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
@@ -421,6 +422,7 @@ int main(int argc, char **argv)
         app.installTranslator(&translator);
         app.installTranslator(&qtTranslator);
     }
+#endif // Q_OS_WIN32
 
     m_defaultExtensions = QLatin1String("java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml");
 
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 7f39be2..f1eaddc 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -981,23 +981,26 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker)
             NodeList nonreentrant;
             NodeList::ConstIterator c = innerNode->childNodes().begin();
             while (c != innerNode->childNodes().end()) {
-                switch ((*c)->threadSafeness()) {
-                case Node::Reentrant:
-                    reentrant.append(*c);
-                    if (threadSafeness == Node::ThreadSafe)
-                        exceptions = true;
-                    break;
-                case Node::ThreadSafe:
-                    threadsafe.append(*c);
-                    if (threadSafeness == Node::Reentrant)
+                
+                if ((*c)->status() != Node::Obsolete){
+                    switch ((*c)->threadSafeness()) {
+                    case Node::Reentrant:
+                        reentrant.append(*c);
+                        if (threadSafeness == Node::ThreadSafe)
+                            exceptions = true;
+                        break;
+                    case Node::ThreadSafe:
+                        threadsafe.append(*c);
+                        if (threadSafeness == Node::Reentrant)
+                            exceptions = true;
+                        break;
+                    case Node::NonReentrant:
+                        nonreentrant.append(*c);
                         exceptions = true;
-                    break;
-                case Node::NonReentrant:
-                    nonreentrant.append(*c);
-                    exceptions = true;
-                    break;
-                default:
-                    break;
+                        break;
+                    default:
+                        break;
+                    }
                 }
                 ++c;
             }
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b3bf764..af4bfe3 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -40,7 +40,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			"		 <li><a href=\"#\">Qt Topics</a> \n" \
 			"			 <ul id=\"topmenuTopic\"> \n" \
 			"			   <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-			"			   <li><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+			"			   <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
 			"			   <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
 			"			   <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
 			"			   <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
@@ -94,7 +94,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          <div id=\"list002\" class=\"list\">\n" \
 			  "            <ul id=\"ul002\" >\n" \
 			  "			   <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+			  "			   <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
 			  "			   <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
 			  "			   <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
 			  "			   <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
diff --git a/tools/qml/browser/Browser.qml b/tools/qml/browser/Browser.qml
index 279c42f..ebed72f 100644
--- a/tools/qml/browser/Browser.qml
+++ b/tools/qml/browser/Browser.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 Rectangle {
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78cd64d..00d43c1 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -89,6 +89,9 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
+        int argc = 0; char **argv = 0;
+        QApplication application(argc, argv); // QApplication() in main has been destroyed already.
+        Q_UNUSED(application)
         QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings);
     }
 }
@@ -516,7 +519,7 @@ int main(int argc, char ** argv)
 
 #if defined (Q_OS_WIN)
     // Debugging output is not visible by default on Windows -
-    // therefore show modal dialog with errors instad.
+    // therefore show modal dialog with errors instead.
     atexit(showWarnings);
 #endif
 
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index c59621a..5e169d8 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -1532,6 +1532,7 @@ void QDeclarativeViewer::registerTypes()
     if (!registered) {
         // registering only for exposing the DeviceOrientation::Orientation enum
         qmlRegisterUncreatableType<DeviceOrientation>("Qt",4,7,"Orientation","");
+        qmlRegisterUncreatableType<DeviceOrientation>("QtQuick",1,0,"Orientation","");
         registered = true;
     }
 }
diff --git a/tools/qml/startup/Logo.qml b/tools/qml/startup/Logo.qml
index 8d9708d..aa5648f 100644
--- a/tools/qml/startup/Logo.qml
+++ b/tools/qml/startup/Logo.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: myApp
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml
index ddc7217..9ca50a3 100644
--- a/tools/qml/startup/startup.qml
+++ b/tools/qml/startup/startup.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Rectangle {
     id: treatsApp