[Kstars-devel] [kstars] /: Disabling KIconLoader. Is this dependency really needed in KStars?

Jasem Mutlaq mutlaqja at ikarustech.com
Sun May 15 06:33:20 UTC 2016


Git commit 85756bee42fb7a4e207ab93f9d3800c4976bcd21 by Jasem Mutlaq.
Committed on 14/05/2016 at 19:21.
Pushed by mutlaqja into branch 'master'.

Disabling KIconLoader. Is this dependency really needed in KStars?

CCMAIL:kstars-devel at kde.org

M  +1    -1    CMakeLists.txt
M  +1    -1    kstars/CMakeLists.txt
M  +1    -2    kstars/kstarsinit.cpp
M  +1    -1    kstars/skymap.cpp

http://commits.kde.org/kstars/85756bee42fb7a4e207ab93f9d3800c4976bcd21

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a284404..48065ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ find_package(KF5 REQUIRED COMPONENTS
   KIO
   XmlGui
   Plotting
-  IconThemes
+# IconThemes
 )
 
 find_package(Eigen3 REQUIRED)
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 27e1414..c3611c8 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -559,7 +559,7 @@ target_link_libraries(KStarsLib
         KF5::KIOFileWidgets
         KF5::WidgetsAddons
         KF5::Plotting
-        KF5::IconThemes
+        #KF5::IconThemes
         Qt5::Gui
         Qt5::PrintSupport
         Qt5::Sql
diff --git a/kstars/kstarsinit.cpp b/kstars/kstarsinit.cpp
index 7d1feba..0051fe3 100644
--- a/kstars/kstarsinit.cpp
+++ b/kstars/kstarsinit.cpp
@@ -22,7 +22,6 @@
 #include <QMenu>
 #include <QWidgetAction>
 
-#include <KIconThemes/KIconLoader>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KTipDialog>
@@ -130,7 +129,7 @@ namespace {
 }
 
 void KStars::initActions() {
-    KIconLoader::global()->addAppDir( "kstars" );
+    //KIconLoader::global()->addAppDir( "kstars" );
     QAction *ka;
 
     // ==== File menu ================
diff --git a/kstars/skymap.cpp b/kstars/skymap.cpp
index f05c429..f9e8311 100644
--- a/kstars/skymap.cpp
+++ b/kstars/skymap.cpp
@@ -38,7 +38,7 @@
 
 #include <KActionCollection>
 #include <KConfig>
-#include <KIconThemes/KIconLoader>
+//#include <KIconThemes/KIconLoader>
 #include <KToolBar>
 #include <KToolInvocation>
 #include <KMessageBox>


More information about the Kstars-devel mailing list