diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-29 00:55:19 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-02 16:06:41 +0300 |
| commit | a02686447a04cf8d5c0ee1664d39747a15206c30 (patch) | |
| tree | fe060f8eac3077e822f6c063a5e61ea20887c73b /platform | |
| parent | 963ae1889338cb372687340408e1e69876704d18 (diff) | |
| download | qtlocation-mapboxgl-a02686447a04cf8d5c0ee1664d39747a15206c30.tar.gz | |
[Qt] Set the test application icon
The super cool Mapbox logo.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/qt/app/mapwindow.cpp | 3 | ||||
| -rw-r--r-- | platform/qt/qmapbox.qrc | 1 | ||||
| -rw-r--r-- | platform/qt/qmlapp/main.cpp | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index c2a07fc9c9..78d740393f 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -2,6 +2,7 @@ #include <QApplication> #include <QDebug> +#include <QIcon> #include <QKeyEvent> #include <QMouseEvent> #include <QString> @@ -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 adb4cf20fd..de0c6cdced 100644 --- a/platform/qt/qmapbox.qrc +++ b/platform/qt/qmapbox.qrc @@ -1,5 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file alias="ca-bundle.crt">../../common/ca-bundle.crt</file> + <file alias="icon.png">../../common/icon.png</file> </qresource> </RCC> diff --git a/platform/qt/qmlapp/main.cpp b/platform/qt/qmlapp/main.cpp index df12663cae..1b07c699cc 100644 --- a/platform/qt/qmlapp/main.cpp +++ b/platform/qt/qmlapp/main.cpp @@ -1,4 +1,5 @@ #include <QGuiApplication> +#include <QIcon> #include <QQmlApplicationEngine> #include <qqml.h> @@ -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>("QQuickMapboxGL", 1, 0, "QQuickMapboxGL"); QQmlApplicationEngine engine; |