mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
Qwt 6.0.1 Support
Upgrade to QWT 6.0.1, but still uses a locally patched copy since support for 8 axes has not been included, despite it being a relatively simple patch. Fixes #634. Fixes #567.
This commit is contained in:
Damien
@@ -1,73 +1,56 @@
|
||||
################################################################
|
||||
# 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
|
||||
################################################################
|
||||
|
||||
QWT_VER_MAJ = 6
|
||||
QWT_VER_MIN = 0
|
||||
QWT_VER_PAT = 1
|
||||
QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
|
||||
|
||||
######################################################################
|
||||
# Install paths
|
||||
######################################################################
|
||||
|
||||
VER_MAJ = 5
|
||||
VER_MIN = 2
|
||||
VER_PAT = 1
|
||||
VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
|
||||
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
|
||||
|
||||
unix {
|
||||
INSTALLBASE = /usr/local/qwt-$$VERSION-svn
|
||||
QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
|
||||
}
|
||||
|
||||
win32 {
|
||||
INSTALLBASE = C:/Qwt-$$VERSION-svn
|
||||
QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
|
||||
}
|
||||
|
||||
target.path = $$INSTALLBASE/lib
|
||||
headers.path = $$INSTALLBASE/include
|
||||
doc.path = $$INSTALLBASE/doc
|
||||
QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
|
||||
QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
|
||||
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
|
||||
|
||||
######################################################################
|
||||
# qmake internal options
|
||||
# Designer plugin
|
||||
######################################################################
|
||||
|
||||
CONFIG += qt # Also for Qtopia Core!
|
||||
CONFIG += warn_on
|
||||
CONFIG += thread
|
||||
QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
|
||||
# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer
|
||||
|
||||
######################################################################
|
||||
# release/debug mode
|
||||
# If you want to build both DEBUG_SUFFIX and RELEASE_SUFFIX
|
||||
# have to differ to avoid, that they overwrite each other.
|
||||
# Features
|
||||
# When building a Qwt application with qmake you might want to load
|
||||
# the compiler/linker flags, that are required to build a Qwt application
|
||||
# from qwt.prf. Therefore all you need to do is to add "CONFIG += qwt"
|
||||
# to your project file and take care, that qwt.prf can be found by qmake.
|
||||
# ( see http://doc.trolltech.com/4.7/qmake-advanced-usage.html#adding-new-configuration-features )
|
||||
# I recommend not to install the Qwt features together with the
|
||||
# Qt features, because you will have to reinstall the Qwt features,
|
||||
# with every Qt upgrade.
|
||||
######################################################################
|
||||
|
||||
VVERSION = $$[QT_VERSION]
|
||||
isEmpty(VVERSION) {
|
||||
|
||||
# Qt 3
|
||||
CONFIG += debug # 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 += debug # release/debug/debug_and_release
|
||||
#CONFIG += debug_and_release
|
||||
#CONFIG += build_all
|
||||
}
|
||||
else {
|
||||
CONFIG += debug # 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
|
||||
}
|
||||
QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
|
||||
# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
|
||||
|
||||
######################################################################
|
||||
# Build the static/shared libraries.
|
||||
@@ -75,38 +58,39 @@ win32 {
|
||||
# it will be a static library.
|
||||
######################################################################
|
||||
|
||||
#CONFIG += QwtDll
|
||||
#QWT_CONFIG += QwtDll
|
||||
|
||||
######################################################################
|
||||
# QwtPlot enables all classes, that are needed to use the QwtPlot
|
||||
# widget.
|
||||
######################################################################
|
||||
|
||||
CONFIG += QwtPlot
|
||||
QWT_CONFIG += QwtPlot
|
||||
|
||||
######################################################################
|
||||
# QwtWidgets enables all classes, that are needed to use the all other
|
||||
# widgets (sliders, dials, ...), beside QwtPlot.
|
||||
######################################################################
|
||||
|
||||
CONFIG += QwtWidgets
|
||||
QWT_CONFIG += QwtWidgets
|
||||
|
||||
######################################################################
|
||||
# If you want to display svg imageson the plot canvas, enable the
|
||||
# line below. Note that Qwt needs the svg+xml, when enabling
|
||||
# QwtSVGItem.
|
||||
# If you want to display svg images on the plot canvas, or
|
||||
# export a plot to a SVG document
|
||||
######################################################################
|
||||
|
||||
#CONFIG += QwtSVGItem
|
||||
QWT_CONFIG += QwtSvg
|
||||
|
||||
######################################################################
|
||||
# If you have a commercial license you can use the MathML renderer
|
||||
# of the Qt solutions package to enable MathML support in Qwt.
|
||||
# So if you want this, copy qtmmlwidget.h + qtmmlwidget.cpp to
|
||||
# textengines/mathml and enable the line below.
|
||||
# You can use the MathML renderer of the Qt solutions package to
|
||||
# enable MathML support in Qwt. Because of license implications
|
||||
# the ( modified ) code of the MML Widget solution is included and
|
||||
# linked together with the QwtMathMLTextEngine into an own library.
|
||||
# To use it you will have to add "CONFIG += qwtmathml"
|
||||
# to your qmake project file.
|
||||
######################################################################
|
||||
|
||||
#CONFIG += QwtMathML
|
||||
QWT_CONFIG += QwtMathML
|
||||
|
||||
######################################################################
|
||||
# If you want to build the Qwt designer plugin,
|
||||
@@ -114,11 +98,27 @@ CONFIG += QwtWidgets
|
||||
# Otherwise you have to build it from the designer directory.
|
||||
######################################################################
|
||||
|
||||
#CONFIG += QwtDesigner
|
||||
# QWT_CONFIG += QwtDesigner
|
||||
|
||||
######################################################################
|
||||
# If you want to auto build the examples, enable the line below
|
||||
# Otherwise you have to build them from the examples directory.
|
||||
######################################################################
|
||||
|
||||
#CONFIG += QwtExamples
|
||||
# QWT_CONFIG += QwtExamples
|
||||
|
||||
######################################################################
|
||||
# Add GoldenCheetah patched plot
|
||||
######################################################################
|
||||
|
||||
QWT_CONFIG += GoldenCheetahPatch
|
||||
|
||||
######################################################################
|
||||
# When Qt has been built as framework qmake ( qtAddLibrary ) wants
|
||||
# to link frameworks instead of regular libs
|
||||
######################################################################
|
||||
|
||||
macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
|
||||
|
||||
QWT_CONFIG += QwtFramework
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user