Group all resources in data/ subfolder

refs #615

resources/resources.pro

@@ -12,13 +12,12 @@ OTHER_FILES += shared/updateinfo/*.*
 
 COPY_FILES += $$PWD/data/images/flags/*.png
 COPY_FILES += $$PWD/data/images/airlines/*.png
-COPY_FILES += $$PWD/shared/bootstrap/*.*
-COPY_FILES += $$PWD/shared/dbdata/*.*
-COPY_FILES += $$PWD/shared/updateinfo/*.*
+COPY_FILES += $$PWD/data/shared/bootstrap/*.*
+COPY_FILES += $$PWD/data/shared/dbdata/*.*
+COPY_FILES += $$PWD/data/shared/updateinfo/*.*
 
 package_resources.path = $$PREFIX
 package_resources.files += data
-package_resources.files += shared
 INSTALLS += package_resources
 
 load(common_post)

src/blackgui/blackgui.pro

@@ -56,8 +56,8 @@ RESOURCES +=
 DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin
 
-OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc
-COPY_FILES += $$PWD/qss/*
+OTHER_FILES += ./data/qss/*.qss ./data/qss/*.css ./data/qss/*.ini *.ico *.rc
+COPY_FILES += $$PWD/data/qss/*
 
 win32 {
     dlltarget.path = $$PREFIX/bin
@@ -67,10 +67,10 @@ win32 {
     INSTALLS += target
 }
 
-package_utils.path = $$PREFIX/qss
-package_utils.files += qss/*.qss
-package_utils.files += qss/*.css
-package_utils.files += qss/*.ini
+package_utils.path = $$PREFIX/data/qss
+package_utils.files += data/qss/*.qss
+package_utils.files += data/qss/*.css
+package_utils.files += data/qss/*.ini
 INSTALLS += package_utils
 
 load(common_post)

src/blackmisc/buildconfig.cpp

@@ -122,7 +122,7 @@ namespace BlackMisc
     QString getSwiftResourceDirImpl()
     {
         QDir dir(CBuildConfig::getApplicationDir());
-        if (dir.cdUp())
+        if (dir.cdUp() && dir.cd("data"))
         {
             Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
             return dir.absolutePath();

src/blacksound/blacksound.pro

@@ -26,8 +26,8 @@ SOURCES += *.cpp
 DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin
 
-OTHER_FILES += ./sounds/*.wav sounds/readme.txt
-COPY_FILES += $$PWD/sounds/*
+OTHER_FILES += ./data/sounds/*.wav ./data/sounds/readme.txt
+COPY_FILES += $$PWD/data/sounds/*
 RESOURCES +=
 
 win32 {
@@ -38,9 +38,9 @@ win32 {
     INSTALLS += target
 }
 
-package_sounds.path = $$PREFIX/sounds
-package_sounds.files += sounds/*.wav
-package_sounds.files += sounds/readme.txt
+package_sounds.path = $$PREFIX/data/sounds
+package_sounds.files += data/sounds/*.wav
+package_sounds.files += data/sounds/readme.txt
 INSTALLS += package_sounds
 
 load(common_post)