[themedaemon] load default icon fi icon not found

nemomobile-ux · Jul 10, 2024 · 0263898 · 0263898
1 parent 4f0a2ec
commit 0263898
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/controls/images/no-icon.png b/src/controls/images/no-icon.png
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -15,6 +15,7 @@ set(HEADERS
     themedaemon/mabstractthemedaemonclient.h)
 
 add_library(nemocoreplugin SHARED ${SRC} ${MLITE})
+add_definitions( -DQT_INSTALL_QML="${QT_INSTALL_QML}")
 
 qt6_add_qml_module(nemocoreplugin
     URI Nemo

diff --git a/src/core/themedaemon/mlocalthemedaemonclient.cpp b/src/core/themedaemon/mlocalthemedaemonclient.cpp
@@ -2,7 +2,7 @@
  **
  ** Copyright (C) 2013 Jolla Ltd.
  ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- ** Copyright (C) 2022 Chupligin Sergey (NeoChapay) <[email protected]>
+ ** Copyright (C) 2022-2024 Chupligin Sergey (NeoChapay) <[email protected]>
  **
  ** This file is part of the Qt Components project.
  **
@@ -46,6 +46,10 @@
 #include <QDirIterator>
 #include <QSettings>
 
+#ifndef QT_INSTALL_QML
+   #error QT_INSTALL_QML is not set!
+#endif
+
 MLocalThemeDaemonClient::MLocalThemeDaemonClient(const QString& testPath, QObject* parent)
     : MAbstractThemeDaemonClient(parent)
     , m_pixmapCache()
@@ -148,6 +152,8 @@ QPixmap MLocalThemeDaemonClient::requestPixmap(const QString& id, const QSize& r
         const QImage image = readImage(parts.at(0));
         if (!image.isNull()) {
             pixmap = QPixmap::fromImage(image);
+        } else {
+            pixmap = QPixmap::fromImage(QImage(QString::fromUtf8(QT_INSTALL_QML) + "/Nemo/Controls/images/no-icon.png"));
         }
         if (parts.length() > 1)
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)