Fixing resource location

Cubitect · Jun 3, 2021 · 5057208 · 5057208
1 parent f2ef76d
commit 5057208
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 18 deletions.
diff --git a/cubiomes b/cubiomes
diff --git a/cubiomes-viewer.pro b/cubiomes-viewer.pro
@@ -9,14 +9,14 @@
 QT      += core widgets
 LIBS    += -lm $$PWD/cubiomes/libcubiomes.a
 
+QMAKE_CFLAGS    =  -fwrapv
+QMAKE_CXXFLAGS  =  $$QMAKE_CFLAGS -std=gnu++11
+QMAKE_CXXFLAGS_RELEASE *= -O3
+
 win32: {
     LIBS += -static -static-libgcc -static-libstdc++
 }
 
-QMAKE_CFLAGS    =  -fwrapv
-QMAKE_CXXFLAGS  =  $$QMAKE_CFLAGS -std=gnu++11 -Wno-deprecated-copy -Wno-missing-field-initilizers
-QMAKE_CXXFLAGS_RELEASE *= -O3
-
 TARGET = cubiomes-viewer
 #TEMPLATE = app
 

diff --git a/src/aboutdialog.h b/src/aboutdialog.h
@@ -5,7 +5,7 @@
 
 #define VERS_MAJOR 1
 #define VERS_MINOR 6
-#define VERS_PATCH -1   // negative patch number designates a development version
+#define VERS_PATCH 0    // negative patch number designates a development version
 
 // returns +1 if newer, -1 if older  and 0 if equal
 inline int cmpVers(int major, int minor, int patch)

diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>587</width>
+    <width>609</width>
     <height>282</height>
    </rect>
   </property>
@@ -53,7 +53,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="icons.qrc">:/icons/map.png</pixmap>
+      <pixmap resource="../icons.qrc">:/icons/map.png</pixmap>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -63,7 +63,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>

diff --git a/src/configdialog.ui b/src/configdialog.ui
@@ -2,11 +2,19 @@
 <ui version="4.0">
  <class>ConfigDialog</class>
  <widget class="QDialog" name="ConfigDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>411</width>
+    <height>222</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Preferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="icons.qrc">
+   <iconset resource="../icons.qrc">
     <normaloff>:/icons/map.png</normaloff>:/icons/map.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -94,7 +102,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>

diff --git a/src/formsearchcontrol.ui b/src/formsearchcontrol.ui
@@ -175,7 +175,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="icons.qrc">
+        <iconset resource="../icons.qrc">
          <normaloff>:/icons/info.png</normaloff>:/icons/info.png</iconset>
        </property>
        <property name="iconSize">
@@ -254,7 +254,7 @@
           <string>Clear results</string>
          </property>
          <property name="icon">
-          <iconset resource="icons.qrc">
+          <iconset resource="../icons.qrc">
            <normaloff>:/icons/clear.png</normaloff>:/icons/clear.png</iconset>
          </property>
         </widget>
@@ -265,7 +265,7 @@
           <string>Start search</string>
          </property>
          <property name="icon">
-          <iconset resource="icons.qrc">
+          <iconset resource="../icons.qrc">
            <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
          </property>
          <property name="checkable">
@@ -280,7 +280,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -31,7 +31,6 @@ Q_DECLARE_METATYPE(Pos)
 Q_DECLARE_METATYPE(Config)
 
 class MapView;
-class Gen48Settings;
 class ProtoBaseDialog;
 
 class MainWindow : public QMainWindow

diff --git a/src/quadlistdialog.ui b/src/quadlistdialog.ui
@@ -14,7 +14,7 @@
    <string>Quad-Structure Scan</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="icons.qrc">
+   <iconset resource="../icons.qrc">
     <normaloff>:/icons/quad.png</normaloff>:/icons/quad.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -172,6 +172,11 @@
          <string>1.7</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>1.6</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item row="0" column="3">
@@ -214,7 +219,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>