Merge commit 'qt/master-stable' into 4.6-stable

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

1 files changed, 27 insertions, 5 deletions

diff --git a/tools/macdeployqt/macchangeqt/main.cpp b/tools/macdeployqt/macchangeqt/main.cpp
index e94e8a3..ebdfc14 100644
--- a/tools/macdeployqt/macchangeqt/main.cpp
+++ b/tools/macdeployqt/macchangeqt/main.cpp
@@ -42,13 +42,35 @@
 
 int main(int argc, char **argv)
 {
-    if (argc != 3) {
-        qDebug() << "Changeqt changes witch qt frameworks an application links against.";
-        qDebug() << "Usage: changeqt app-bundle qt-dir";
+    // useDebugLibs should always be false because even if set all Qt
+    // libraries inside a binary to point to debug versions, as soon as
+    // one of them loads a Qt plugin, the plugin itself will load the
+    // release version of Qt, and as such, the app will crash.
+    bool useDebugLibs = false;
+
+    int optionsSpecified = 0;
+    for (int i = 2; i < argc; ++i) {
+        QByteArray argument = QByteArray(argv[i]);
+        if (argument.startsWith(QByteArray("-verbose="))) {
+            LogDebug() << "Argument found:" << argument;
+            optionsSpecified++;
+            int index = argument.indexOf("=");
+            bool ok = false;
+            int number = argument.mid(index+1).toInt(&ok);
+            if (!ok)
+                LogError() << "Could not parse verbose level";
+            else
+                logLevel = number;
+        }
+    }
+
+    if (argc != (3 + optionsSpecified)) {
+        qDebug() << "Changeqt: changes witch Qt frameworks an application links against.";
+        qDebug() << "Usage: changeqt app-bundle qt-dir <-verbose=[0-3]>";
         return 0;
     }
-    
+
     const QString appPath = QString::fromLocal8Bit(argv[1]);
     const QString qtPath = QString::fromLocal8Bit(argv[2]);
-    changeQtFrameworks(appPath, qtPath);
+    changeQtFrameworks(appPath, qtPath, useDebugLibs);
 }