[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1049570 by kuemmel:

don't put debug and release object files into the same folder on windows

 M  +0 -1      config.pri  
 M  +2 -2      dataobjectplugin.pri  
 M  +2 -2      datasourceplugin.pri  
 M  +4 -3      kst.pri  
 M  +2 -2      tests/tests.pro  


--- branches/work/kst/portto4/kst/config.pri #1049569:1049570
@@ -13,7 +13,6 @@
 # Set to 1 to disable usage of gsl - only for unix
 DISABLE_GSL = 0
 
-win32:CONFIG += debug_and_release
 
 defineTest(LibExists) {
   lib = $$ARGS
--- branches/work/kst/portto4/kst/dataobjectplugin.pri #1049569:1049570
@@ -2,8 +2,8 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
+!win32:OBJECTS_DIR = tmp
+!win32:MOC_DIR = tmp
 DESTDIR = $$OUTPUT_DIR/plugin
 
 ! isEmpty(INSTALL_PREFIX) {
--- branches/work/kst/portto4/kst/datasourceplugin.pri #1049569:1049570
@@ -2,8 +2,8 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
+!win32:OBJECTS_DIR = tmp
+!win32:MOC_DIR = tmp
 DESTDIR = $$OUTPUT_DIR/plugin
 
 ! isEmpty(INSTALL_PREFIX) {
--- branches/work/kst/portto4/kst/kst.pri #1049569:1049570
@@ -25,13 +25,14 @@
 
 DEBUG_MODE = $$(KST_DEBUG_MODE)
 contains(DEBUG_MODE, 1) {
-  CONFIG += debug
+  !win32:CONFIG += debug
   QMAKE_RPATHDIR += $$OUTPUT_DIR/lib $$OUTPUT_DIR/plugin
 }
 
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
 
+!win32:OBJECTS_DIR = tmp
+!win32:MOC_DIR = tmp
+
 TOPLEVELDIR = $$PWD
 
 INCLUDEPATH += $$TOPLEVELDIR
--- branches/work/kst/portto4/kst/tests/tests.pro #1049569:1049570
@@ -5,8 +5,8 @@
 macx:CONFIG -= app_bundle
 CONFIG += qtestlib
 TEMPLATE = app
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
+!win32:OBJECTS_DIR = tmp
+!win32:MOC_DIR = tmp
 TARGET = runtests
 DESTDIR = $$OUTPUT_DIR/bin