From 8ab2a5e12311d6897b3cab14cbc0daad357bb076 Mon Sep 17 00:00:00 2001
From: ephy <ephy>
Date: Fri, 19 Mar 2010 19:18:51 +0000
Subject: [PATCH] GCS/qwt: Fixes to project files

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@345 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/libs/qwt/qwtconfig.pri | 50 +++---------------------------
 ground/src/libs/qwt/src/src.pro   | 51 ++-----------------------------
 2 files changed, 7 insertions(+), 94 deletions(-)

diff --git a/ground/src/libs/qwt/qwtconfig.pri b/ground/src/libs/qwt/qwtconfig.pri
index 601220335..82754c682 100644
--- a/ground/src/libs/qwt/qwtconfig.pri
+++ b/ground/src/libs/qwt/qwtconfig.pri
@@ -2,10 +2,10 @@
 # Install paths
 ######################################################################
 
-VER_MAJ      = 5
-VER_MIN      = 2
-VER_PAT      = 0
-VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+#VER_MAJ      = 5
+#VER_MIN      = 2
+#VER_PAT      = 0
+#VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
 
 ######################################################################
 # qmake internal options
@@ -22,48 +22,6 @@ CONFIG           += thread
 ######################################################################
 
 VVERSION = $$[QT_VERSION]
-isEmpty(VVERSION) {
-
-    # Qt 3
-    CONFIG           += release     # release/debug
-}
-else {
-    # Qt 4
-    win32 {
-        # On Windows you can't mix release and debug libraries.
-        # The designer is built in release mode. If you like to use it
-        # you need a release version. For your own application development you
-        # might need a debug version. 
-        # Enable debug_and_release + build_all if you want to build both.
-
-        CONFIG           += release     # release/debug/debug_and_release
-        #CONFIG           += release_and_release
-        #CONFIG           += build_all
-    }
-    else {
-        CONFIG           += release     # release/debug
-    }
-}
-
-######################################################################
-# If you want to have different names for the debug and release 
-# versions you can add a suffix rule below.
-######################################################################
-
-DEBUG_SUFFIX        = 
-RELEASE_SUFFIX      = 
-
-win32 {
-    DEBUG_SUFFIX      = d
-}
-
-######################################################################
-# Build the static/shared libraries.
-# If QwtDll is enabled, a shared library is built, otherwise
-# it will be a static library.
-######################################################################
-
-CONFIG           += QwtDll
 
 ######################################################################
 # QwtPlot enables all classes, that are needed to use the QwtPlot 
diff --git a/ground/src/libs/qwt/src/src.pro b/ground/src/libs/qwt/src/src.pro
index 3e8d521d2..133f92b0f 100644
--- a/ground/src/libs/qwt/src/src.pro
+++ b/ground/src/libs/qwt/src/src.pro
@@ -1,56 +1,11 @@
-# -*- mode: sh -*- ###########################
-# Qwt Widget Library
-# Copyright (C) 1997   Josef Wilgen
-# Copyright (C) 2002   Uwe Rathmann
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the Qwt License, Version 1.0
-##############################################
-
-# qmake project file for building the qwt libraries
-
-include(../../../openpilotgcslibrary.pri)
-include( ../qwtconfig.pri )
-
 TEMPLATE = lib
 TARGET = Qwt
 DEFINES += QWT_LIBRARY
+include(../../../openpilotgcslibrary.pri)
+include( ../qwtconfig.pri )
 
-SUFFIX_STR =
-VVERSION = $$[QT_VERSION]
-isEmpty(VVERSION) {
+#VVERSION = $$[QT_VERSION]
 
-    # Qt 3
-    debug {
-        SUFFIX_STR = $${DEBUG_SUFFIX}
-    }
-    else {
-        SUFFIX_STR = $${RELEASE_SUFFIX} 
-    }
-}
-else {
-    CONFIG(debug, debug|release) {
-        SUFFIX_STR = $${DEBUG_SUFFIX}
-    }
-    else {
-        SUFFIX_STR = $${RELEASE_SUFFIX}
-    }
-}
-
-MOC_DIR           = moc
-OBJECTS_DIR       = obj$${SUFFIX_STR}
-#DESTDIR           = $${QWT_ROOT}/lib
-
-contains(CONFIG, QwtDll ) {
-    CONFIG += dll
-} 
-else {
-    CONFIG += staticlib
-}
-
-win32:QwtDll {
-    DEFINES    += QT_DLL QWT_DLL QWT_MAKEDLL
-}
 
 HEADERS += \
     qwt.h \