From a02686447a04cf8d5c0ee1664d39747a15206c30 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 29 Apr 2016 00:55:19 +0300 Subject: [PATCH] [Qt] Set the test application icon The super cool Mapbox logo. --- platform/qt/app/mapwindow.cpp | 3 +++ platform/qt/qmapbox.qrc | 1 + platform/qt/qmlapp/main.cpp | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index c2a07fc9c..78d740393 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -22,6 +23,8 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) connect(&m_zoomAnimation, SIGNAL(finished()), this, SLOT(animationFinished())); connect(&m_zoomAnimation, SIGNAL(valueChanged(const QVariant&)), this, SLOT(animationValueChanged())); + + setWindowIcon(QIcon(":icon.png")); } void MapWindow::selfTest() diff --git a/platform/qt/qmapbox.qrc b/platform/qt/qmapbox.qrc index adb4cf20f..de0c6cdce 100644 --- a/platform/qt/qmapbox.qrc +++ b/platform/qt/qmapbox.qrc @@ -1,5 +1,6 @@ ../../common/ca-bundle.crt + ../../common/icon.png diff --git a/platform/qt/qmlapp/main.cpp b/platform/qt/qmlapp/main.cpp index df12663ca..1b07c699c 100644 --- a/platform/qt/qmlapp/main.cpp +++ b/platform/qt/qmlapp/main.cpp @@ -1,4 +1,5 @@ #include +#include #include #include @@ -8,6 +9,10 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); +#if QT_VERSION >= 0x050300 + app.setWindowIcon(QIcon(":icon.png")); +#endif + qmlRegisterType("QQuickMapboxGL", 1, 0, "QQuickMapboxGL"); QQmlApplicationEngine engine;