[Kst] branches/work/kst/2.0.0-beta2/kst

[Mike Fenton]

SVN commit 964968 by fenton:

Fix link order compatibility errors with mingw.
Add windows icon.


 M  +1 -1      dataobjectplugin.pri  
 M  +1 -1      src/d2asc/d2asc.pro  
 M  +1 -1      src/d2d/d2d.pro  
 M  +2 -1      src/kst/kst.pro  
 M  +1 -1      src/libkstapp/libkstapp.pro  
 M  +1 -1      src/widgets/widgets.pro  
 M  +1 -1      tests/tests.pro  


--- branches/work/kst/2.0.0-beta2/kst/dataobjectplugin.pri #964967:964968
@@ -19,4 +19,4 @@
     $$TOPLEVELDIR/src/widgets \
     $$OUTPUT_DIR/src/widgets \
 
-LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst -lkstmath -lkstwidgets -lkstapp
+LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkstapp -lkstwidgets -lkstmath -lkst
--- branches/work/kst/2.0.0-beta2/kst/src/d2asc/d2asc.pro #964967:964968
@@ -12,7 +12,7 @@
     $$TOPLEVELDIR/src/libkstapp \
     $$OUTPUT_DIR/src/kst/tmp
 
-LIBS += -lkst -lkstmath -lkstwidgets -lkstapp
+LIBS += -lkstapp -lkstwidgets -lkstmath -lkst
 
 SOURCES += \
     d2asc.cpp
--- branches/work/kst/2.0.0-beta2/kst/src/d2d/d2d.pro #964967:964968
@@ -12,7 +12,7 @@
     $$TOPLEVELDIR/src/libkstapp \
     $$OUTPUT_DIR/src/kst/tmp
 
-LIBS += -lkst -lkstmath -lkstwidgets -lkstapp
+LIBS += -lkstapp -lkstwidgets -lkstmath -lkst
 
 SOURCES += \
     d2d.cpp
--- branches/work/kst/2.0.0-beta2/kst/src/kst/kst.pro #964967:964968
@@ -18,7 +18,7 @@
     $$TOPLEVELDIR/src/libkstapp \
     $$OUTPUT_DIR/src/kst/tmp
 
-LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst -lkstmath -lkstwidgets -lkstapp
+LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkstapp -lkstwidgets -lkstmath -lkst
 
 SOURCES += \
     main.cpp
@@ -27,3 +27,4 @@
     $$TOPLEVELDIR/src/images/images.qrc
 
 win32:QT += svg opengl
+win32:RC_FILE = kst_icon.rc
--- branches/work/kst/2.0.0-beta2/kst/src/libkstapp/libkstapp.pro #964967:964968
@@ -21,7 +21,7 @@
     $$OUTPUT_DIR/src/widgets \
     $$OUTPUT_DIR/src/libkstapp/tmp
 
-LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkst -lkstmath -lkstwidgets
+LIBS += -L$$OUTPUT_DIR/lib -L$$OUTPUT_DIR/plugin -lkstwidgets -lkstmath -lkst
 
 SOURCES += \
     application.cpp \
--- branches/work/kst/2.0.0-beta2/kst/src/widgets/widgets.pro #964967:964968
@@ -21,7 +21,7 @@
     $$TOPLEVELDIR/src/libkstmath \
     $$OUTPUT_DIR/src/widgets/tmp
 
-LIBS += -L$$OUTPUT_DIR/lib -lkst -lkstmath
+LIBS += -L$$OUTPUT_DIR/lib -lkstmath -lkst
 
 SOURCES += \
     colorbutton.cpp \
--- branches/work/kst/2.0.0-beta2/kst/tests/tests.pro #964967:964968
@@ -18,7 +18,7 @@
     $$TOPLEVELDIR/src/libkstapp \
     $$OUTPUT_DIR/src/kst/tmp
 
-LIBS += -lkst -lkstmath -lkstwidgets -lkstapp
+LIBS += -lkstapp -lkstwidgets -lkstmath -lkst
 
 SOURCES += \
     main.cpp \