diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-04-15 15:59:03 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-04-17 06:25:10 +0000 |
| commit | d7b7fed0cddf6236db3cf1bfdf9cc1380929cf5c (patch) | |
| tree | 396f1ef554656b862e10f1eee3914acc2c664e7d /tools/qml/main.cpp | |
| parent | 259c958e21c63f227a1bb678867210e0f6af0991 (diff) | |
Update the QML Runtime icon
A new one has been drawn; use it on all platforms, not just on macOS.
It is now also used as the default window icon, to be more identifiable
when minimized, etc. Of course it can be overridden by plugins that
can be loaded from qml.
[ChangeLog][QtQml][qml] The QML Runtime tool now has an updated
application icon and a default window icon. QtQuick applications
can still use QWindow::setIcon() to override the window icon.
Task-number: QTBUG-70826
Task-number: QTBUG-74662
Change-Id: I8671d0c99f7f4283dbe2dc4c605abb560f7bf1a1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
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 7dfae2b53d..8918de57d4 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -77,6 +77,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 { @@ -134,7 +135,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 { @@ -450,6 +454,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 |