Revert "Use icons relative path."

This reverts commit b0d98f6e269be9560de1b9c140855c85fecf1dd1.

24 files changed, 49 insertions, 49 deletions

diff --git a/desktop-widgets/about.ui b/desktop-widgets/about.ui
index 3062f5f62..98159253c 100644
--- a/desktop-widgets/about.ui
+++ b/desktop-widgets/about.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../subsurface.qrc">
-    <normaloff>:subsurface-icon</normaloff>:subsurface-icon</iconset>
+    <normaloff>:/subsurface-icon</normaloff>:/subsurface-icon</iconset>
   </property>
   <property name="modal">
    <bool>true</bool>
@@ -39,7 +39,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../subsurface.qrc">:subsurface-icon</pixmap>
+      <pixmap resource="../subsurface.qrc">:/subsurface-icon</pixmap>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui
index d647d1134..2192be70d 100644
--- a/desktop-widgets/configuredivecomputerdialog.ui
+++ b/desktop-widgets/configuredivecomputerdialog.ui
@@ -215,7 +215,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:icons/ostc3.png</normaloff>:icons/ostc3.png</iconset>
+         <normaloff>:/icons/ostc3.png</normaloff>:/icons/ostc3.png</iconset>
        </property>
       </item>
       <item>
@@ -224,7 +224,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:icons/suunto_vyper.png</normaloff>:icons/suunto_vyper.png</iconset>
+         <normaloff>:/icons/suunto_vyper.png</normaloff>:/icons/suunto_vyper.png</iconset>
        </property>
       </item>
       <item>
@@ -233,7 +233,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:icons/ostc2n.png</normaloff>:icons/ostc2n.png</iconset>
+         <normaloff>:/icons/ostc2n.png</normaloff>:/icons/ostc2n.png</iconset>
        </property>
       </item>
       <item>
@@ -242,7 +242,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:icons/ostc4.png</normaloff>:icons/ostc4.png</iconset>
+         <normaloff>:/icons/ostc4.png</normaloff>:/icons/ostc4.png</iconset>
        </property>
       </item>
      </widget>
diff --git a/desktop-widgets/divecomponentselection.ui b/desktop-widgets/divecomponentselection.ui
index ba58c546b..8262a5c2a 100644
--- a/desktop-widgets/divecomponentselection.ui
+++ b/desktop-widgets/divecomponentselection.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/desktop-widgets/divecomputermanagementdialog.ui b/desktop-widgets/divecomputermanagementdialog.ui
index 0533f681d..0e5db2c41 100644
--- a/desktop-widgets/divecomputermanagementdialog.ui
+++ b/desktop-widgets/divecomputermanagementdialog.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/desktop-widgets/divelogexportdialog.ui b/desktop-widgets/divelogexportdialog.ui
index 0d02d9fd8..d01f817c6 100644
--- a/desktop-widgets/divelogexportdialog.ui
+++ b/desktop-widgets/divelogexportdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
diff --git a/desktop-widgets/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui
index 515608c32..36746ffe9 100644
--- a/desktop-widgets/divelogimportdialog.ui
+++ b/desktop-widgets/divelogimportdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/desktop-widgets/downloadfromdivecomputer.ui b/desktop-widgets/downloadfromdivecomputer.ui
index 874da643b..10d654b46 100644
--- a/desktop-widgets/downloadfromdivecomputer.ui
+++ b/desktop-widgets/downloadfromdivecomputer.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
diff --git a/desktop-widgets/filterwidget.ui b/desktop-widgets/filterwidget.ui
index 8e42019ce..1450d81b2 100644
--- a/desktop-widgets/filterwidget.ui
+++ b/desktop-widgets/filterwidget.ui
@@ -74,7 +74,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:filter-reset</normaloff>:filter-reset</iconset>
+         <normaloff>:/filter-reset</normaloff>:/filter-reset</iconset>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
@@ -88,7 +88,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:filter-hide</normaloff>:filter-hide</iconset>
+         <normaloff>:/filter-hide</normaloff>:/filter-hide</iconset>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
@@ -102,7 +102,7 @@
        </property>
        <property name="icon">
         <iconset resource="../subsurface.qrc">
-         <normaloff>:filter-close</normaloff>:filter-close</iconset>
+         <normaloff>:/filter-close</normaloff>:/filter-close</iconset>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui
index 9103bbc1f..24b7977e4 100644
--- a/desktop-widgets/locationInformation.ui
+++ b/desktop-widgets/locationInformation.ui
@@ -77,7 +77,7 @@
      </property>
      <property name="icon">
       <iconset>
-       <normaloff>:satellite</normaloff>:satellite</iconset>
+       <normaloff>:/satellite</normaloff>:/satellite</iconset>
      </property>
     </widget>
    </item>
@@ -166,7 +166,7 @@
      </property>
      <property name="icon">
       <iconset resource="../subsurface.qrc">
-       <normaloff>:mapwidget-marker-selected</normaloff>:mapwidget-marker-selected</iconset>
+       <normaloff>:/mapwidget-marker-selected</normaloff>:/mapwidget-marker-selected</iconset>
      </property>
     </widget>
    </item>
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 550372ec6..71babd03a 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1105,7 +1105,7 @@ void MainWindow::on_actionYearlyStatistics_triggered()
 	d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint
 		| Qt::WindowCloseButtonHint | Qt::WindowTitleHint);
 	d.setWindowTitle(tr("Yearly statistics"));
-	d.setWindowIcon(QIcon(":subsurface-icon"));
+	d.setWindowIcon(QIcon(":/subsurface-icon"));
 	d.exec();
 }
 
diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 75b4f7f5c..67adccb23 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -479,7 +479,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_o2</normaloff>:icon_o2</iconset>
+     <normaloff>:/icon_o2</normaloff>:/icon_o2</iconset>
    </property>
    <property name="text">
     <string>Toggle pO₂ graph</string>
@@ -491,7 +491,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_n2</normaloff>:icon_n2</iconset>
+     <normaloff>:/icon_n2</normaloff>:/icon_n2</iconset>
    </property>
    <property name="text">
     <string>Toggle pN₂ graph</string>
@@ -503,7 +503,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_he</normaloff>:icon_he</iconset>
+     <normaloff>:/icon_he</normaloff>:/icon_he</iconset>
    </property>
    <property name="text">
     <string>Toggle pHe graph</string>
@@ -515,7 +515,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_dc</normaloff>:icon_ceiling_dc</iconset>
+     <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</iconset>
    </property>
    <property name="text">
     <string>Toggle DC reported ceiling</string>
@@ -527,7 +527,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_calculated</normaloff>:icon_ceiling_calculated</iconset>
+     <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</iconset>
    </property>
    <property name="text">
     <string>Toggle calculated ceiling</string>
@@ -539,7 +539,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_alltissues</normaloff>:icon_ceiling_alltissues</iconset>
+     <normaloff>:/icon_ceiling_alltissues</normaloff>:/icon_ceiling_alltissues</iconset>
    </property>
    <property name="text">
     <string>Toggle calculating all tissues</string>
@@ -551,7 +551,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_3m</normaloff>:icon_ceiling_3m</iconset>
+     <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</iconset>
    </property>
    <property name="text">
     <string>Toggle calculated ceiling with 3m increments</string>
@@ -563,7 +563,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_HR</normaloff>:icon_HR</iconset>
+     <normaloff>:/icon_HR</normaloff>:/icon_HR</iconset>
    </property>
    <property name="text">
     <string>Toggle heart rate</string>
@@ -575,7 +575,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_mod</normaloff>:icon_mod</iconset>
+     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
    </property>
    <property name="text">
     <string>Toggle MOD</string>
@@ -587,7 +587,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ead</normaloff>:icon_ead</iconset>
+     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
    </property>
    <property name="text">
     <string>Toggle EAD, END, EADD</string>
@@ -599,7 +599,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_NDLTTS</normaloff>:icon_NDLTTS</iconset>
+     <normaloff>:/icon_NDLTTS</normaloff>:/icon_NDLTTS</iconset>
    </property>
    <property name="text">
     <string>Toggle NDL, TTS</string>
@@ -611,7 +611,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_lung</normaloff>:icon_lung</iconset>
+     <normaloff>:/icon_lung</normaloff>:/icon_lung</iconset>
    </property>
    <property name="text">
     <string>Toggle SAC rate</string>
@@ -623,7 +623,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:ruler</normaloff>:ruler</iconset>
+     <normaloff>:/ruler</normaloff>:/ruler</iconset>
    </property>
    <property name="text">
     <string>Toggle ruler</string>
@@ -635,7 +635,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:scale</normaloff>:scale</iconset>
+     <normaloff>:/scale</normaloff>:/scale</iconset>
    </property>
    <property name="text">
     <string>Scale graph</string>
@@ -647,7 +647,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:pictures</normaloff>:pictures</iconset>
+     <normaloff>:/pictures</normaloff>:/pictures</iconset>
    </property>
    <property name="text">
     <string>Toggle pictures</string>
@@ -659,7 +659,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:gaschange</normaloff>:gaschange</iconset>
+     <normaloff>:/gaschange</normaloff>:/gaschange</iconset>
    </property>
    <property name="text">
     <string>Toggle gas bar</string>
@@ -682,7 +682,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_tissue</normaloff>:icon_tissue</iconset>
+     <normaloff>:/icon_tissue</normaloff>:/icon_tissue</iconset>
    </property>
    <property name="text">
     <string>Toggle tissue heat-map</string>
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui
index b5caa5ab1..a13891fbc 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp
index 1d960d4b5..d839f9e29 100644
--- a/desktop-widgets/preferences/preferences_georeference.cpp
+++ b/desktop-widgets/preferences/preferences_georeference.cpp
@@ -8,7 +8,7 @@
 
 #include <ctime>
 
-PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":georeference"), 9)
+PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":/georeference"), 9)
 {
 	ui = new Ui::PreferencesGeoreference();
 	ui->setupUi(this);
diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp
index def46a0e2..5f7b5f488 100644
--- a/desktop-widgets/preferences/preferences_language.cpp
+++ b/desktop-widgets/preferences/preferences_language.cpp
@@ -10,7 +10,7 @@
 
 #include "qt-models/models.h"
 
-PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":language"), 4)
+PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":/language"), 4)
 {
 	ui = new Ui::PreferencesLanguage();
 	ui->setupUi(this);
diff --git a/desktop-widgets/renumber.ui b/desktop-widgets/renumber.ui
index f7cb2ff2f..5580f5cce 100644
--- a/desktop-widgets/renumber.ui
+++ b/desktop-widgets/renumber.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/desktop-widgets/setpoint.ui b/desktop-widgets/setpoint.ui
index 7f490218c..707df250f 100644
--- a/desktop-widgets/setpoint.ui
+++ b/desktop-widgets/setpoint.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/desktop-widgets/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui
index a2ba0b8b1..be09c23c1 100644
--- a/desktop-widgets/shiftimagetimes.ui
+++ b/desktop-widgets/shiftimagetimes.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/desktop-widgets/shifttimes.ui b/desktop-widgets/shifttimes.ui
index 3c03b7d57..486b1f43b 100644
--- a/desktop-widgets/shifttimes.ui
+++ b/desktop-widgets/shifttimes.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 457589dde..44ab49797 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -30,13 +30,13 @@ public:
 	MinMaxAvgWidgetPrivate(MinMaxAvgWidget *owner)
 	{
 		avgIco = new QLabel(owner);
-		avgIco->setPixmap(QIcon(":average").pixmap(16, 16));
+		avgIco->setPixmap(QIcon(":/average").pixmap(16, 16));
 		avgIco->setToolTip(QObject::tr("Average"));
 		minIco = new QLabel(owner);
-		minIco->setPixmap(QIcon(":minimum").pixmap(16, 16));
+		minIco->setPixmap(QIcon(":/minimum").pixmap(16, 16));
 		minIco->setToolTip(QObject::tr("Minimum"));
 		maxIco = new QLabel(owner);
-		maxIco->setPixmap(QIcon(":maximum").pixmap(16, 16));
+		maxIco->setPixmap(QIcon(":/maximum").pixmap(16, 16));
 		maxIco->setToolTip(QObject::tr("Maximum"));
 		avgValue = new QLabel(owner);
 		minValue = new QLabel(owner);
diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui
index 6fa611153..6f02c775d 100644
--- a/desktop-widgets/tab-widgets/maintab.ui
+++ b/desktop-widgets/tab-widgets/maintab.ui
@@ -226,7 +226,7 @@
                  </property>
                  <property name="icon">
                   <iconset resource="../../subsurface.qrc">
-                   <normaloff>:geocode</normaloff>:geocode</iconset>
+                   <normaloff>:/geocode</normaloff>:/geocode</iconset>
                  </property>
                 </widget>
                </item>
diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index f742fbcaf..f73ea0bce 100644
--- a/desktop-widgets/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
@@ -104,7 +104,7 @@ void UpdateManager::requestReceived()
 #ifndef SUBSURFACE_MOBILE
 	if (haveNewVersion || !isAutomaticCheck) {
 		msgbox.setWindowTitle(msgTitle);
-		msgbox.setWindowIcon(QIcon(":subsurface-icon"));
+		msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
 		msgbox.setText(msgText);
 		msgbox.setTextFormat(Qt::RichText);
 		msgbox.exec();
diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp
index 580dadcfd..41cb09570 100644
--- a/desktop-widgets/usermanual.cpp
+++ b/desktop-widgets/usermanual.cpp
@@ -74,7 +74,7 @@ UserManual::UserManual(QWidget *parent) : QWidget(parent)
 	addAction(actionHideSearch);
 
 	setWindowTitle(tr("User manual"));
-	setWindowIcon(QIcon(":subsurface-icon"));
+	setWindowIcon(QIcon(":/subsurface-icon"));
 
 #ifdef USE_WEBENGINE
 	userManual = new MyQWebEngineView(this);
diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index dd6d62231..fe55b9279 100644
--- a/desktop-widgets/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
@@ -126,7 +126,7 @@ void UserSurvey::requestReceived()
 	}
 
 	msgbox.setWindowTitle(msgTitle);
-	msgbox.setWindowIcon(QIcon(":subsurface-icon"));
+	msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
 	msgbox.setText(msgText);
 	msgbox.setTextFormat(Qt::RichText);
 	msgbox.exec();
diff --git a/desktop-widgets/webservices.ui b/desktop-widgets/webservices.ui
index 2c8f8fe1d..bcca35f1e 100644
--- a/desktop-widgets/webservices.ui
+++ b/desktop-widgets/webservices.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normalon>:subsurface-icon</normalon>
+    <normalon>:/subsurface-icon</normalon>
    </iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">