Merge

1 files changed, 81 insertions, 70 deletions

diff --git a/src/organizer.pro b/src/organizer.pro
index 75c701b9..19d3a3a0 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -5,15 +5,15 @@
 #-------------------------------------------------

 

 

-contains(QT_VERSION, "^5.*") {

-	QT       += core gui widgets network xml sql xmlpatterns qml quick script webkit webkitwidgets

+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 \

@@ -89,7 +89,8 @@ SOURCES += \
     safewritefile.cpp \

     modflagicondelegate.cpp \

     pluginflagicondelegate.cpp \

-    organizerproxy.cpp

+    organizerproxy.cpp \

+    viewmarkingscrollbar.cpp

 

 

 HEADERS  += \

@@ -168,7 +169,8 @@ HEADERS  += \
     pdll.h \

     modflagicondelegate.h \

     pluginflagicondelegate.h \

-    organizerproxy.h

+    organizerproxy.h \

+    viewmarkingscrollbar.h

 

 FORMS    += \

     transfersavesdialog.ui \

@@ -202,28 +204,68 @@ 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

+  PRE_TARGETDEPS += $$OUT_PWD/../shared/debug/mo_shared.lib \

+    $$OUT_PWD/../bsatk/debug/bsatk.lib

 } 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 += /Zi# /GL

 #  QMAKE_CXXFLAGS -= -O2

-  QMAKE_LFLAGS += /DEBUG /LTCG /OPT:REF /OPT:ICF

+  QMAKE_LFLAGS += /DEBUG# /LTCG /OPT:REF /OPT:ICF

+  PRE_TARGETDEPS += $$OUT_PWD/../shared/release/mo_shared.lib \

+    $$OUT_PWD/../bsatk/release/bsatk.lib

 }

 

 #QMAKE_CXXFLAGS_WARN_ON -= -W3

@@ -243,7 +285,8 @@ TRANSLATIONS = organizer_de.ts \
                organizer_zh_CN.ts \

                organizer_cs.ts \

                organizer_tr.ts \

-               organizer_en.ts \

+               organizer_en_US.ts \

+               organizer_ko.ts \

                organizer_ru.ts

 

 #!isEmpty(TRANSLATIONS) {

@@ -275,6 +318,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

@@ -288,60 +338,21 @@ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\tutorials) $$quote($$DSTDIR)
 QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)

 

 CONFIG(debug, debug|release) {

-	contains(QT_VERSION, "^5.*") {

-		QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

-		QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.debug.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)

-		QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug.qt5 $$escape_expand(\\n)

-	} else {

-		QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

-		QMAKE_POST_LINK += copy /y $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$quote($$DSTDIR)\\dlls\\dlls.manifest $$escape_expand(\\n)

-		QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$escape_expand(\\n)

-	}

+  greaterThan(QT_MAJOR_VERSION, 4) {

+    QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

+    QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.debug.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)

+    QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug.qt5 $$escape_expand(\\n)

+  } else {

+    QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

+    QMAKE_POST_LINK += copy /y $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$quote($$DSTDIR)\\dlls\\dlls.manifest $$escape_expand(\\n)

+    QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$escape_expand(\\n)

+  }

 } else {

-	contains(QT_VERSION, "^5.*") {

-		QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

-		QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)

-		QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.qt5 $$escape_expand(\\n)

-	} else {

-		QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

-	}

+  greaterThan(QT_MAJOR_VERSION, 4) {

+    QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)

+    QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)

+    QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.qt5 $$escape_expand(\\n)

+  } 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