mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
Fixes scopegadget loading issues with Qt versions > 4.7.4
This commit is contained in:
parent
fdcea01100
commit
3d896ffaf5
@ -30,6 +30,14 @@ VVERSION = $$[QT_VERSION]
|
||||
|
||||
CONFIG += QwtPlot
|
||||
|
||||
######################################################################
|
||||
# Build the static/shared libraries.
|
||||
# If QwtDll is enabled, a shared library is built, otherwise
|
||||
# it will be a static library.
|
||||
######################################################################
|
||||
|
||||
QWT_CONFIG += QwtDll
|
||||
|
||||
######################################################################
|
||||
# QwtWidgets enables all classes, that are needed to use the all other
|
||||
# widgets (sliders, dials, ...), beside QwtPlot.
|
||||
|
@ -29,17 +29,14 @@
|
||||
#pragma warning(disable: 4660)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#ifdef QWT_DLL
|
||||
|
||||
#if defined(QWT_MAKEDLL) // create a Qwt DLL library
|
||||
#define QWT_EXPORT __declspec(dllexport)
|
||||
#define QWT_EXPORT Q_DECL_EXPORT
|
||||
#define QWT_TEMPLATEDLL
|
||||
#else // use a Qwt DLL library
|
||||
#define QWT_EXPORT __declspec(dllimport)
|
||||
#define QWT_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
|
||||
#endif // QWT_DLL
|
||||
|
||||
#endif // Q_WS_WIN
|
||||
|
||||
#ifndef QWT_EXPORT
|
||||
|
@ -4,9 +4,14 @@ DEFINES += QWT_LIBRARY
|
||||
include(../../../openpilotgcslibrary.pri)
|
||||
include( ../qwtconfig.pri )
|
||||
|
||||
#VVERSION = $$[QT_VERSION]
|
||||
|
||||
contains(QWT_CONFIG, QwtDll) {
|
||||
|
||||
CONFIG += dll
|
||||
win32|symbian: DEFINES += QT_DLL QWT_DLL QWT_MAKEDLL
|
||||
}
|
||||
else {
|
||||
CONFIG += staticlib
|
||||
}
|
||||
HEADERS += \
|
||||
qwt.h \
|
||||
qwt_abstract_scale_draw.h \
|
||||
|
Loading…
x
Reference in New Issue
Block a user