Merge branch 'master' of https://github.com/palaeoware/SPIERS

palaeoware · Oct 31, 2018 · 88f26cd · 88f26cd
2 parents 58f343a + 5ab48d8
commit 88f26cd
Show file tree

Hide file tree

Showing 12 changed files with 679 additions and 2,578 deletions.
diff --git a/SPIERSalign/SPIERSalign.pro b/SPIERSalign/SPIERSalign.pro
@@ -12,7 +12,8 @@ CONFIG += qt \
     release \
     warn_on
 
-RESOURCES += align.qrc
+RESOURCES += align.qrc \
+    ../SPIERScommon/licenseresource.qrc
 
 UI_DIR = build
 

diff --git a/SPIERSalign/src/about.cpp b/SPIERSalign/src/about.cpp
diff --git a/SPIERScommon/LicenseWithMarkup.txt b/SPIERScommon/LicenseWithMarkup.txt
diff --git a/SPIERScommon/licenseresource.qrc b/SPIERScommon/licenseresource.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/license">
+        <file alias="license">LicenseWithMarkup.txt</file>
+    </qresource>
+</RCC>
diff --git a/SPIERSedit/SPIERSedit.pro b/SPIERSedit/SPIERSedit.pro
@@ -15,7 +15,8 @@ CONFIG += warn_on \
     qt \
     thread \
 
-RESOURCES = SPIERSedit.qrc
+RESOURCES = SPIERSedit.qrc \
+    ../SPIERScommon/licenseresource.qrc
 
 UI_DIR += ui
 

diff --git a/SPIERSedit/SPIERSedit.qrc b/SPIERSedit/SPIERSedit.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/license">
         <file>resources/gplv3-127x51.png</file>
         <file>resources/Built_with_Qt_RGB_logo.png</file>
         <file>resources/palaeoware_logo_square.png</file>

diff --git a/SPIERSedit/src/dialogaboutimpl.cpp b/SPIERSedit/src/dialogaboutimpl.cpp
diff --git a/SPIERSutility/SPIERSversion/SPIERSversion.pro b/SPIERSutility/SPIERSversion/SPIERSversion.pro
@@ -12,7 +12,8 @@ CONFIG += qt \
     release \
     warn_on
 
-RESOURCES = version.qrc
+RESOURCES = version.qrc \
+    ../../SPIERScommon/licenseresource.qrc
 
 DESTDIR \
     += \

diff --git a/SPIERSutility/SPIERSversion/src/aboutdialog.cpp b/SPIERSutility/SPIERSversion/src/aboutdialog.cpp
diff --git a/SPIERSview/SPIERSview.pro b/SPIERSview/SPIERSview.pro
@@ -17,7 +17,8 @@ CONFIG += qt \
     release \
     warn_on
 
-RESOURCES = view.qrc
+RESOURCES = view.qrc \
+    ../SPIERScommon/licenseresource.qrc
 
 DESTDIR \
     += \

diff --git a/SPIERSview/src/aboutdialog.cpp b/SPIERSview/src/aboutdialog.cpp
diff --git a/SPIERSview/src/main.h b/SPIERSview/src/main.h
@@ -1,6 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
-
+//COMMENT
 #include <QApplication>
 #include <QString>
 #include <QEvent>