Merge pull request #3 from linuxdeploy/fix_icons_not_being_loaded

Fix icons not being loaded
contributes to linuxdeploy/linuxdeploy-plugin-qt#17

Author: azubieta

Diff for: .travis.yml

@@ -16,6 +16,8 @@ addons:
     - qt510-meta-minimal
     - qt510declarative
     - qt510webengine
+    - qt510svg
+    - qt510imageformats
     - mesa-common-dev
     - cmake
 install:

Diff for: QtWidgetsApplication/QtWidgetsApplication.pro

@@ -37,3 +37,6 @@ icon.files = QtWidgetsApplication.png
 desktop_entry.path = $$PREFIX/share/applications
 desktop_entry.files = QtWidgetsApplication.desktop
 INSTALLS += target icon desktop_entry
+
+RESOURCES += \
+    resources/icons/icons.qrc

Diff for: QtWidgetsApplication/QtWidgetsApplication.pro.user

@@ -1,21 +1,19 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
+#include <QDebug>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
-    QAction *action = new QAction(this);
-    QIcon icon;
-    auto iconThemeName = QStringLiteral("list-add");
-    if (QIcon::hasThemeIcon(iconThemeName)) {
-        icon = QIcon::fromTheme(iconThemeName);
-    } else {
-        icon.addFile(QStringLiteral("."), QSize(), QIcon::Normal, QIcon::Off);
-    }
-    action->setIcon(icon);
-    ui->mainToolBar->addAction(action);
+
+    // There is no warranty that a given icon will be present in the target platform icons theme
+    // therefore we must provide a fallback
+    QIcon addIcon = QIcon::fromTheme("list-add", QIcon(":/scalable/list-add.svg"));
+    QAction *addAction = new QAction(addIcon, tr("&Add..."), this);
+
+    ui->mainToolBar->addAction(addAction);
 }
 
 MainWindow::~MainWindow()

Diff for: QtWidgetsApplication/mainwindow.cpp

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>scalable/list-add.svg</file>
+    </qresource>
+</RCC>