rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Fixes scopegadget loading issues with Qt versions > 4.7.4

Browse Source
This commit is contained in:
zedamota 2012-01-28 21:25:38 +00:00 committed by David Ankers
parent fdcea01100
commit 3d896ffaf5
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/libs/qwt/qwtconfig.pri
View File

@ -30,6 +30,14 @@ VVERSION = $$[QT_VERSION]
CONFIG += QwtPlot 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 # QwtWidgets enables all classes, that are needed to use the all other
# widgets (sliders, dials, ...), beside QwtPlot. # widgets (sliders, dials, ...), beside QwtPlot.

7
ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
View File

@ -29,17 +29,14 @@
#pragma warning(disable: 4660) #pragma warning(disable: 4660)
#endif // _MSC_VER #endif // _MSC_VER
#ifdef QWT_DLL
#if defined(QWT_MAKEDLL) // create a Qwt DLL library #if defined(QWT_MAKEDLL) // create a Qwt DLL library
#define QWT_EXPORT __declspec(dllexport) #define QWT_EXPORT Q_DECL_EXPORT
#define QWT_TEMPLATEDLL #define QWT_TEMPLATEDLL
#else // use a Qwt DLL library #else // use a Qwt DLL library
#define QWT_EXPORT __declspec(dllimport) #define QWT_EXPORT Q_DECL_IMPORT
#endif #endif
#endif // QWT_DLL
#endif // Q_WS_WIN #endif // Q_WS_WIN
#ifndef QWT_EXPORT #ifndef QWT_EXPORT

9
ground/openpilotgcs/src/libs/qwt/src/src.pro
View File

@ -4,9 +4,14 @@ DEFINES += QWT_LIBRARY
include(../../../openpilotgcslibrary.pri) include(../../../openpilotgcslibrary.pri)
include( ../qwtconfig.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 += \ HEADERS += \
qwt.h \ qwt.h \
qwt_abstract_scale_draw.h \ qwt_abstract_scale_draw.h \