1 files changed, 27 insertions, 8 deletions
diff --git a/src/organizer.pro b/src/organizer.pro
index 9f3e15d3..42836524 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -9,7 +9,7 @@ TARGET = ModOrganizer
 TEMPLATE = app
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-	QT       += core gui widgets network xml sql xmlpatterns qml quick script webkit webkitwidgets
+  QT       += core gui widgets network xml sql xmlpatterns qml declarative script webkit webkitwidgets
 } else {
   QT       += core gui network xml declarative script sql xmlpatterns webkit
 }
@@ -93,7 +93,10 @@ SOURCES += \
     safewritefile.cpp \
     modflagicondelegate.cpp \
     genericicondelegate.cpp \
-    organizerproxy.cpp
+    organizerproxy.cpp \
+    viewmarkingscrollbar.cpp \
+    plugincontainer.cpp \
+    organizercore.cpp
 
 
 HEADERS  += \
@@ -172,7 +175,11 @@ HEADERS  += \
     pdll.h \
     modflagicondelegate.h \
     genericicondelegate.h \
-    organizerproxy.h
+    organizerproxy.h \
+    viewmarkingscrollbar.h \
+    plugincontainer.h \
+    organizercore.h \
+    iuserinterface.h
 
 FORMS    += \
     transfersavesdialog.ui \
@@ -277,7 +284,7 @@ CONFIG(debug, debug|release) {
 
 #QMAKE_CXXFLAGS_WARN_ON -= -W3
 #QMAKE_CXXFLAGS_WARN_ON += -W4
-QMAKE_CXXFLAGS += -wd4100 -wd4127 -wd4512 -wd4189
+QMAKE_CXXFLAGS += /wd4100 -wd4127 -wd4512 -wd4189
 
 CONFIG += embed_manifest_exe
 
@@ -335,9 +342,21 @@ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\tutorials) $$quote($$DSTDIR
 QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
 
 CONFIG(debug, debug|release) {
-  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($$BASEDIR\\..\\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($$BASEDIR\\..\\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 {
-  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($$BASEDIR\\..\\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($$BASEDIR\\..\\dlls.*manifest) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+  }
 }