nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "QT5 -- QWT 6.1 canvas fixup"

Browse Source 
This reverts commit 54234ceca4.
This commit is contained in:
Mark Liversedge
2013-12-11 16:37:50 +00:00
parent bc00f4d1b3
commit a399bea470
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qwt/examples/animation/main.cpp
View File

@@ -2,7 +2,7 @@
#include "plot.h"
#ifndef QWT_NO_OPENGL
#define USE_OPENGL 0
#define USE_OPENGL 1
#endif
#if USE_OPENGL

2
qwt/examples/refreshtest/main.cpp
View File

@@ -3,7 +3,7 @@
#ifndef QWT_NO_OPENGL
#if QT_VERSION >= 0x040600 && QT_VERSION < 0x050000
#define USE_OPENGL 0
#define USE_OPENGL 1
#endif
#endif

2
qwt/examples/refreshtest/plot.cpp
View File

@@ -1,5 +1,3 @@
#define QWT_NO_OPENGL
#include <qglobal.h>
#include <qwt_painter.h>
#include <qwt_plot_canvas.h>

2
qwt/qwtconfig.pri
View File

@@ -70,7 +70,7 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
# it will be a static library.
######################################################################
#QWT_CONFIG += QwtDll
QWT_CONFIG += QwtDll
######################################################################
# QwtPlot enables all classes, that are needed to use the QwtPlot

8
qwt/src/qwt_plot.cpp
View File

@@ -110,7 +110,7 @@ class QwtPlot::PrivateData
public:
QPointer<QwtTextLabel> titleLabel;
QPointer<QwtTextLabel> footerLabel;
QPointer<QwtPlotCanvas> canvas;
QPointer<QWidget> canvas;
QPointer<QwtAbstractLegend> legend;
QwtPlotLayout *layout;
@@ -241,7 +241,7 @@ void QwtPlot::initPlot( const QwtText &title )
\param canvas Canvas Widget
\sa canvas()
*/
void QwtPlot::setCanvas( QwtPlotCanvas *canvas )
void QwtPlot::setCanvas( QWidget *canvas )
{
if ( canvas == d_data->canvas )
return;
@@ -491,7 +491,7 @@ const QwtAbstractLegend *QwtPlot::legend() const
/*!
\return the plot's canvas
*/
QwtPlotCanvas *QwtPlot::canvas()
QWidget *QwtPlot::canvas()
{
return d_data->canvas;
}
@@ -499,7 +499,7 @@ QwtPlotCanvas *QwtPlot::canvas()
/*!
\return the plot's canvas
*/
const QwtPlotCanvas *QwtPlot::canvas() const
const QWidget *QwtPlot::canvas() const
{
return d_data->canvas;
}

7
qwt/src/qwt_plot.h
View File

@@ -14,7 +14,6 @@
#include "qwt_axis_id.h"
#include "qwt_text.h"
#include "qwt_plot_dict.h"
#include "qwt_plot_canvas.h"
#include "qwt_scale_map.h"
#include "qwt_interval.h"
#include <qframe.h>
@@ -153,10 +152,10 @@ public:
// Canvas
void setCanvas( QwtPlotCanvas * );
void setCanvas( QWidget * );
QwtPlotCanvas *canvas();
const QwtPlotCanvas *canvas() const;
QWidget *canvas();
const QWidget *canvas() const;
void setCanvasBackground( const QBrush & );
QBrush canvasBackground() const;