Merge remote-tracking branch 'origin/2.6'

Conflicts: dist/gdb/Makefile.osx src/libs/qmldebug/qmldebug.qbs src/plugins/android/androidsettingswidget.cpp Change-Id: I85627130b575f7d08f416dea52031fa72019b217
2012-10-04 12:23:39 +02:00
parent d2bf853ca1 ed86a7ca58
commit db4311d5b5
110 changed files with 2246 additions and 534 deletions
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
    setrlimit(RLIMIT_NOFILE, &rl);
 #endif

-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
    // QML is unusable with the xlib backend
    QApplication::setGraphicsSystem("raster");
 #endif