From 2b5748003d2ae4de1b897041f92df3e0495b2825 Mon Sep 17 00:00:00 2001
From: TheBloke <devnull@localhost>
Date: Mon, 7 Jul 2014 23:32:18 +0100
Subject: .pro files - formatting/consistency fixes  Many small formatting
 changes to the majority of .pro files  Consistent style for Qt version
 checking, using greaterThan(QT_MAJOR_VERSION, 4)   This seems safest, as
 would continue to work for a future Qt 6 etc.   Note that this makes
 redudundant the commit before this one, to organizer.pro  Consistent
 indenting  Moved some file configuration sections to be together with related
 sections  Moved some installation-related sections (e.g. OUTDIR/DSTDIR) to be
 at the bottom,   immediately before the related POST_LINK install lines. 
 Similarly, in some cases separated out CONFIG(debug,.. checks into separate  
 LIB/INCLUDE sections (high in file) and installation directory sections (low 
   in file)

---
 src/organizer.pro     | 100 ++++++++++++++++++++++++++------------------------
 src/shared/shared.pro |   4 +-
 2 files changed, 54 insertions(+), 50 deletions(-)

(limited to 'src')

diff --git a/src/organizer.pro b/src/organizer.pro
index bed1ca47..5be205b4 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -5,15 +5,15 @@
 #-------------------------------------------------
 
 
-equals(QT_MAJOR_VERSION, 5) {
+TARGET = ModOrganizer
+TEMPLATE = app
+
+greaterThan(QT_MAJOR_VERSION, 4) {
   QT       += core gui widgets network xml sql xmlpatterns qml quick script webkit
 } else {
   QT       += core gui network xml declarative script sql xmlpatterns webkit
 }
 
-TARGET = ModOrganizer
-TEMPLATE = app
-
 SOURCES += \
     transfersavesdialog.cpp \
     syncoverwritedialog.cpp \
@@ -202,24 +202,60 @@ FORMS    += \
     browserdialog.ui \
     aboutdialog.ui
 
+RESOURCES += \
+    resources.qrc \
+    stylesheet_resource.qrc
+
+RC_FILE += \
+    app_icon.rc
+
+OTHER_FILES += \
+    version.rc \
+    tutorials/firststeps.qml \
+    tutorials/tutorials.js \
+    tutorials/tutorial_firststeps_main.js \
+    tutorials/tutorials_settingsdialog.qml \
+    tutorials/tutorials_mainwindow.qml \
+    tutorials/Highlight.qml \
+    tutorials/TutorialDescription.qml \
+    tutorials/TutorialOverlay.qml \
+    tutorials/tutorials_nexusdialog.qml \
+    tutorials/tutorials_modinfodialog.qml \
+    tutorials/tutorial_firststeps_modinfo.js \
+    tutorials/tutorial_conflictresolution_main.js \
+    tutorials/tutorial_conflictresolution_modinfo.js \
+    app_icon.rc \
+    dark.qss \
+    stylesheets/dark.qss \
+    tutorials/tutorial_window_installer.js \
+    tutorials/tutorials_installdialog.qml \
+    tutorials/tutorial_firststeps_settings.js
+
+
+# leak detection with vld
+#INCLUDEPATH += "E:/Visual Leak Detector/include"
+#LIBS += -L"E:/Visual Leak Detector/lib/Win32"
+#DEFINES += LEAK_CHECK_WITH_VLD
+
+#SOURCES += modeltest.cpp
+#HEADERS += modeltest.h
+#DEFINES += TEST_MODELS
+
+
 INCLUDEPATH += ../shared ../archive ../uibase ../bsatk ../esptk ../boss_modified/boss-api "$(BOOSTPATH)"
 
 LIBS += -L"$(BOOSTPATH)/stage/lib"
 
 CONFIG(debug, debug|release) {
-  OUTDIR = $$OUT_PWD/debug
-  DSTDIR = $$PWD/../../outputd
   LIBS += -L$$OUT_PWD/../shared/debug
   LIBS += -L$$OUT_PWD/../bsatk/debug
   LIBS += -L$$OUT_PWD/../uibase/debug
   LIBS += -L$$OUT_PWD/../boss_modified/debug
   LIBS += -lDbgHelp
 } else {
-  OUTDIR = $$OUT_PWD/release
-  DSTDIR = $$PWD/../../output
   LIBS += -L$$OUT_PWD/../shared/release
   LIBS += -L$$OUT_PWD/../bsatk/release
-	LIBS += -L$$OUT_PWD/../uibase/release
+  LIBS += -L$$OUT_PWD/../uibase/release
   LIBS += -L$$OUT_PWD/../boss_modified/release
   QMAKE_CXXFLAGS += /Zi /GL
 #  QMAKE_CXXFLAGS -= -O2
@@ -275,6 +311,13 @@ DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
 HGID = $$system(hg id -i)
 DEFINES += HGID=\\\"$${HGID}\\\"
 
+CONFIG(debug, debug|release) {
+  OUTDIR = $$OUT_PWD/debug
+  DSTDIR = $$PWD/../../outputd
+} else {
+  OUTDIR = $$OUT_PWD/release
+  DSTDIR = $$PWD/../../output
+}
 
 SRCDIR = $$PWD
 SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g
@@ -294,42 +337,3 @@ CONFIG(debug, debug|release) {
 } else {
   QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
 }
-
-RESOURCES += \
-    resources.qrc \
-    stylesheet_resource.qrc
-
-RC_FILE += \
-    app_icon.rc
-
-OTHER_FILES += \
-    version.rc \
-    tutorials/firststeps.qml \
-    tutorials/tutorials.js \
-    tutorials/tutorial_firststeps_main.js \
-    tutorials/tutorials_settingsdialog.qml \
-    tutorials/tutorials_mainwindow.qml \
-    tutorials/Highlight.qml \
-    tutorials/TutorialDescription.qml \
-    tutorials/TutorialOverlay.qml \
-    tutorials/tutorials_nexusdialog.qml \
-    tutorials/tutorials_modinfodialog.qml \
-    tutorials/tutorial_firststeps_modinfo.js \
-    tutorials/tutorial_conflictresolution_main.js \
-    tutorials/tutorial_conflictresolution_modinfo.js \
-    app_icon.rc \
-    dark.qss \
-    stylesheets/dark.qss \
-    tutorials/tutorial_window_installer.js \
-    tutorials/tutorials_installdialog.qml \
-    tutorials/tutorial_firststeps_settings.js
-
-
-# leak detection with vld
-#INCLUDEPATH += "E:/Visual Leak Detector/include"
-#LIBS += -L"E:/Visual Leak Detector/lib/Win32"
-#DEFINES += LEAK_CHECK_WITH_VLD
-
-#SOURCES += modeltest.cpp
-#HEADERS += modeltest.h
-#DEFINES += TEST_MODELS
diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index 992fd7f2..5f327fa3 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -21,11 +21,11 @@ INCLUDEPATH += ../bsatk "$(BOOSTPATH)"
 
 CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../bsatk/debug
-	LIBS += -lDbgHelp
+  LIBS += -lDbgHelp
   QMAKE_CXXFLAGS_DEBUG -= -Zi
   QMAKE_CXXFLAGS += -Z7
 } else {
-		LIBS += -L$$OUT_PWD/../bsatk/release
+  LIBS += -L$$OUT_PWD/../bsatk/release
 }
 
 LIBS += -lbsatk
-- 
cgit v1.3.1