From 6a4c0baf9e468eae447e056422869c43b33fdd6d 2012-06-12 12:18:44
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-06-12 12:18:44
Subject: [PATCH] Removed system_build from build config

---

diff --git a/charts.pro b/charts.pro
index 48984ba..8e3e3eb 100644
--- a/charts.pro
+++ b/charts.pro
@@ -7,17 +7,6 @@ SUBDIRS = src plugins examples demos tests
 
 development_build: message('Development build')
 
-!system_build:{
-    message('Configured for local build against local libs...')
-    message('You can run "make" to build qchart library, examples, demos and plugin...')
-    message('You can run "make install" to install qchart in qt sdk...')
-} else {
-    message('Running build aginst system libs...')
-    message('Building only charts library...')
-    message('Afterwards you can run "cd examples; qmake ; make " to build examples.')
-    SUBDIRS = src
-}
-
 CONFIG += ordered
 QMAKE_CXXFLAGS += -g -Wall
 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html 
diff --git a/config.pri b/config.pri
index 95b6418..0bd00d1 100644
--- a/config.pri
+++ b/config.pri
@@ -1,6 +1,11 @@
 
 LIBRARY_NAME = QtCommercialChart
-coverage: CONFIG+=debug
+CONFIG(debug, debug|release) {
+    mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
+    win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
+}
+
+coverage: CONFIG += debug
 
 ##################### SHADOW CONFIG #################################################
 
@@ -62,32 +67,22 @@ development_build: {
 
 ##################### BUILD CONFIG ########################################################
 
-CONFIG(debug, debug|release) {
-    mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
-    win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
-}
-
-!system_build:{
-
-    INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
+INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
 
-    !win32: {
-        LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
+!win32: {
+    LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
+} else {
+    win32-msvc*: {
+        # hack fix for error:
+        #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
+        QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
     } else {
-        win32-msvc*: {
-            # hack fix for error:
-            #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
-            QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
-        } else {
-            LIBS += -L $$CHART_BUILD_LIB_DIR
-        }
+        LIBS += -L $$CHART_BUILD_LIB_DIR
     }
-       
-    LIBS += -l$$LIBRARY_NAME
-} else {
-    CONFIG += qtcommercialchart 
 }
 
+LIBS += -l$$LIBRARY_NAME
+
 ##################### UNIT TESTS ##############################################################
 
 CONFIG(debug, debug|release) {