diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-19 01:00:04 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-19 01:00:04 +0200 |
commit | 53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (patch) | |
tree | f4b1407fa828e4d6ac608dbef97b4b9f3203a7cc /tools/qml/main.cpp | |
parent | 2bdbf216fe7b6cf9d404b80ac405bd3969f5c07f (diff) | |
parent | c018df5b4075ae962966d4df7653d476dab02840 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9ef4be23bfe35aa48d4c65d4159e72c527943845
Diffstat (limited to 'tools/qml/main.cpp')
-rw-r--r-- | tools/qml/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 166c6aabdf..8cfc0eaaac 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -78,6 +78,7 @@ static QQmlApplicationEngine *qae = nullptr; static int exitTimerId = -1; #endif bool verboseMode = false; +static const QString iconResourcePath(QStringLiteral(":/qt-project.org/QmlRuntime/resources/qml-64.png")); static void loadConf(const QString &override, bool quiet) // Terminates app on failure { @@ -135,7 +136,10 @@ void noFilesGiven(); class LoaderApplication : public QGuiApplication { public: - LoaderApplication(int& argc, char **argv) : QGuiApplication(argc, argv) {} + LoaderApplication(int& argc, char **argv) : QGuiApplication(argc, argv) + { + setWindowIcon(QIcon(iconResourcePath)); + } bool event(QEvent *ev) override { @@ -448,6 +452,7 @@ int main(int argc, char *argv[]) #ifdef QT_WIDGETS_LIB case QmlApplicationTypeWidget: app = new QApplication(argc, argv); + static_cast<QApplication *>(app)->setWindowIcon(QIcon(iconResourcePath)); break; #endif // QT_WIDGETS_LIB #endif // QT_GUI_LIB |