diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 11:47:50 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2014-07-01 11:56:07 +0200 |
| commit | 605ba2c2268b2dce3d0b06899101d03a67e7f251 (patch) | |
| tree | 9d9574e54bed094734a46ae83b93d9a9328374b1 /src | |
| parent | e4becdc3d310a0dd1a6d34d0796a52b21dedeb2d (diff) | |
Fix init order of platfromIntegration and forcedWindowIcon
The problem shows when running tst_qguiapplication.cpp and configuring
with -no-widgets
Change-Id: I9f241760953e543d488096c66a3e886a14f6ae50
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 29ab7daca0..85fc9f3893 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1102,6 +1102,8 @@ void QGuiApplicationPrivate::createPlatformIntegration() // Get command line params + QString icon; + int j = argc ? 1 : 0; for (int i=1; i<argc; i++) { if (argv[i] && *argv[i] != '-') { @@ -1129,8 +1131,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() firstWindowTitle = QString::fromLocal8Bit(argv[i]); } else if (arg == "-qwindowicon" || (isXcb && arg == "-icon")) { if (++i < argc) { - const QString icon = QString::fromLocal8Bit(argv[i]); - forcedWindowIcon = QDir::isAbsolutePath(icon) ? QIcon(icon) : QIcon::fromTheme(icon); + icon = QString::fromLocal8Bit(argv[i]); } } else { argv[j++] = argv[i]; @@ -1144,6 +1145,8 @@ void QGuiApplicationPrivate::createPlatformIntegration() init_platform(QLatin1String(platformName), platformPluginPath, platformThemeName, argc, argv); + if (!icon.isEmpty()) + forcedWindowIcon = QDir::isAbsolutePath(icon) ? QIcon(icon) : QIcon::fromTheme(icon); } /*! |