From f21dfb47769bad07b8d6d52502080a75d1a80c0d Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Mon, 18 Sep 2023 08:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dqwt=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qwtdemo/examples/animation/animation.pro | 4 +-- third/qwtdemo/examples/barchart/barchart.pro | 4 +-- third/qwtdemo/examples/bode/bode.pro | 13 +++++----- third/qwtdemo/examples/controls/controls.pro | 4 +-- third/qwtdemo/examples/cpuplot/cpuplot.pro | 18 ++++++------- .../qwtdemo/examples/curvdemo1/curvdemo1.pro | 4 +-- .../examples/dials/attitude_indicator.cpp | 3 ++- third/qwtdemo/examples/dials/dials.pro | 4 +-- .../examples/distrowatch/distrowatch.pro | 4 +-- .../examples/event_filter/event_filter.pro | 4 +-- .../qwtdemo/examples/friedberg/friedberg.pro | 16 +++++------- .../examples/itemeditor/itemeditor.pro | 4 +-- third/qwtdemo/examples/legends/legends.pro | 4 +-- .../examples/oscilloscope/oscilloscope.pro | 4 +-- third/qwtdemo/examples/radio/radio.pro | 4 +-- .../examples/rasterview/rasterview.pro | 13 ++++------ third/qwtdemo/examples/realtime/realtime.pro | 4 +-- .../examples/refreshtest/refreshtest.pro | 26 +++++++++---------- .../examples/scatterplot/scatterplot.pro | 16 +++++------- .../examples/simpleplot/simpleplot.pro | 7 +++-- .../qwtdemo/examples/sinusplot/sinusplot.pro | 7 +++-- .../examples/spectrogram/spectrogram.pro | 13 ++++------ .../examples/stockchart/stockchart.pro | 24 ++++++++--------- third/qwtdemo/examples/sysinfo/sysinfo.pro | 7 +++-- third/qwtdemo/examples/tvplot/tvplot.pro | 13 ++++------ 25 files changed, 102 insertions(+), 122 deletions(-) diff --git a/third/qwtdemo/examples/animation/animation.pro b/third/qwtdemo/examples/animation/animation.pro index e1a0172..07586aa 100644 --- a/third/qwtdemo/examples/animation/animation.pro +++ b/third/qwtdemo/examples/animation/animation.pro @@ -10,6 +10,6 @@ SOURCES += main.cpp SOURCES += plot.cpp HEADERS += plot.h -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/barchart/barchart.pro b/third/qwtdemo/examples/barchart/barchart.pro index 3778997..4c1d9df 100644 --- a/third/qwtdemo/examples/barchart/barchart.pro +++ b/third/qwtdemo/examples/barchart/barchart.pro @@ -10,6 +10,6 @@ SOURCES += main.cpp SOURCES += barchart.cpp HEADERS += barchart.h -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/bode/bode.pro b/third/qwtdemo/examples/bode/bode.pro index 5f1575e..2a1a9ce 100644 --- a/third/qwtdemo/examples/bode/bode.pro +++ b/third/qwtdemo/examples/bode/bode.pro @@ -6,14 +6,15 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -SOURCES += main.cpp -SOURCES += plot.cpp -SOURCES += mainwindow.cpp -HEADERS += plot.h HEADERS += mainwindow.h HEADERS += complexnumber.h HEADERS += pixmaps.h -include ($$PWD/../../qwt/qwt.pri) +SOURCES += main.cpp +SOURCES += plot.cpp +SOURCES += mainwindow.cpp +HEADERS += plot.h + INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/controls/controls.pro b/third/qwtdemo/examples/controls/controls.pro index b1484da..e56e4f2 100644 --- a/third/qwtdemo/examples/controls/controls.pro +++ b/third/qwtdemo/examples/controls/controls.pro @@ -27,6 +27,6 @@ SOURCES = \ dialtab.cpp \ main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/cpuplot/cpuplot.pro b/third/qwtdemo/examples/cpuplot/cpuplot.pro index 4b9ae49..9a7766d 100644 --- a/third/qwtdemo/examples/cpuplot/cpuplot.pro +++ b/third/qwtdemo/examples/cpuplot/cpuplot.pro @@ -6,16 +6,14 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - cpuplot.h \ - cpustat.h \ - cpupiemarker.h +HEADERS += cpuplot.h +HEADERS += cpustat.h +HEADERS += cpupiemarker.h -SOURCES = \ - cpuplot.cpp \ - cpustat.cpp \ - cpupiemarker.cpp +SOURCES += cpuplot.cpp +SOURCES += cpustat.cpp +SOURCES += cpupiemarker.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/curvdemo1/curvdemo1.pro b/third/qwtdemo/examples/curvdemo1/curvdemo1.pro index 42bf237..a51270b 100644 --- a/third/qwtdemo/examples/curvdemo1/curvdemo1.pro +++ b/third/qwtdemo/examples/curvdemo1/curvdemo1.pro @@ -9,6 +9,6 @@ DESTDIR = $$PWD/../bin SOURCES = \ curvdemo1.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/dials/attitude_indicator.cpp b/third/qwtdemo/examples/dials/attitude_indicator.cpp index a5810be..78418f5 100644 --- a/third/qwtdemo/examples/dials/attitude_indicator.cpp +++ b/third/qwtdemo/examples/dials/attitude_indicator.cpp @@ -1,9 +1,10 @@ -#include "attitude_indicator.h" +#include "attitude_indicator.h" #include #include #include #include #include +#include AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color ) { diff --git a/third/qwtdemo/examples/dials/dials.pro b/third/qwtdemo/examples/dials/dials.pro index f7abd9f..5b576b8 100644 --- a/third/qwtdemo/examples/dials/dials.pro +++ b/third/qwtdemo/examples/dials/dials.pro @@ -19,6 +19,6 @@ SOURCES = \ compass_grid.cpp \ dials.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/distrowatch/distrowatch.pro b/third/qwtdemo/examples/distrowatch/distrowatch.pro index d721f3f..1f987d7 100644 --- a/third/qwtdemo/examples/distrowatch/distrowatch.pro +++ b/third/qwtdemo/examples/distrowatch/distrowatch.pro @@ -13,6 +13,6 @@ SOURCES = \ barchart.cpp \ main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/event_filter/event_filter.pro b/third/qwtdemo/examples/event_filter/event_filter.pro index 6f63338..fb316bb 100644 --- a/third/qwtdemo/examples/event_filter/event_filter.pro +++ b/third/qwtdemo/examples/event_filter/event_filter.pro @@ -19,6 +19,6 @@ SOURCES = \ plot.cpp \ event_filter.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/friedberg/friedberg.pro b/third/qwtdemo/examples/friedberg/friedberg.pro index e197c67..647840b 100644 --- a/third/qwtdemo/examples/friedberg/friedberg.pro +++ b/third/qwtdemo/examples/friedberg/friedberg.pro @@ -6,15 +6,13 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - plot.h \ - friedberg2007.h +HEADERS += plot.h +HEADERS += friedberg2007.h -SOURCES = \ - friedberg2007.cpp \ - plot.cpp \ - main.cpp +SOURCES += friedberg2007.cpp +SOURCES += plot.cpp +SOURCES += main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/itemeditor/itemeditor.pro b/third/qwtdemo/examples/itemeditor/itemeditor.pro index 388c690..47bb76f 100644 --- a/third/qwtdemo/examples/itemeditor/itemeditor.pro +++ b/third/qwtdemo/examples/itemeditor/itemeditor.pro @@ -17,6 +17,6 @@ SOURCES = \ plot.cpp \ main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/legends/legends.pro b/third/qwtdemo/examples/legends/legends.pro index 43cdd4f..2efad62 100644 --- a/third/qwtdemo/examples/legends/legends.pro +++ b/third/qwtdemo/examples/legends/legends.pro @@ -18,6 +18,6 @@ SOURCES = \ plot.cpp \ main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/oscilloscope/oscilloscope.pro b/third/qwtdemo/examples/oscilloscope/oscilloscope.pro index 65c5617..9002f47 100644 --- a/third/qwtdemo/examples/oscilloscope/oscilloscope.pro +++ b/third/qwtdemo/examples/oscilloscope/oscilloscope.pro @@ -25,6 +25,6 @@ SOURCES = \ mainwindow.cpp \ main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/radio/radio.pro b/third/qwtdemo/examples/radio/radio.pro index 4929a0d..e4f687b 100644 --- a/third/qwtdemo/examples/radio/radio.pro +++ b/third/qwtdemo/examples/radio/radio.pro @@ -17,6 +17,6 @@ SOURCES = \ tunerfrm.cpp \ radio.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/rasterview/rasterview.pro b/third/qwtdemo/examples/rasterview/rasterview.pro index e5ab816..835e170 100644 --- a/third/qwtdemo/examples/rasterview/rasterview.pro +++ b/third/qwtdemo/examples/rasterview/rasterview.pro @@ -6,13 +6,10 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - plot.h +HEADERS += plot.h +SOURCES += plot.cpp +SOURCES += main.cpp -SOURCES = \ - plot.cpp \ - main.cpp - -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/realtime/realtime.pro b/third/qwtdemo/examples/realtime/realtime.pro index 63d0baf..5442766 100644 --- a/third/qwtdemo/examples/realtime/realtime.pro +++ b/third/qwtdemo/examples/realtime/realtime.pro @@ -21,6 +21,6 @@ SOURCES = \ incrementalplot.cpp \ randomplot.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/refreshtest/refreshtest.pro b/third/qwtdemo/examples/refreshtest/refreshtest.pro index 3b18363..9da41b7 100644 --- a/third/qwtdemo/examples/refreshtest/refreshtest.pro +++ b/third/qwtdemo/examples/refreshtest/refreshtest.pro @@ -6,20 +6,18 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - settings.h \ - circularbuffer.h \ - panel.h \ - plot.h \ - mainwindow.h +HEADERS += settings.h +HEADERS += circularbuffer.h +HEADERS += panel.h +HEADERS += plot.h +HEADERS += mainwindow.h -SOURCES = \ - circularbuffer.cpp \ - panel.cpp \ - plot.cpp \ - mainwindow.cpp \ - main.cpp +SOURCES += circularbuffer.cpp +SOURCES += panel.cpp +SOURCES += plot.cpp +SOURCES += mainwindow.cpp +SOURCES += main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/scatterplot/scatterplot.pro b/third/qwtdemo/examples/scatterplot/scatterplot.pro index e6ae876..a1527be 100644 --- a/third/qwtdemo/examples/scatterplot/scatterplot.pro +++ b/third/qwtdemo/examples/scatterplot/scatterplot.pro @@ -6,15 +6,13 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - mainwindow.h \ - plot.h +HEADERS += mainwindow.h +HEADERS += plot.h -SOURCES = \ - main.cpp \ - mainwindow.cpp \ - plot.cpp +SOURCES += main.cpp +SOURCES += mainwindow.cpp +SOURCES += plot.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/simpleplot/simpleplot.pro b/third/qwtdemo/examples/simpleplot/simpleplot.pro index e68571f..3a4a79b 100644 --- a/third/qwtdemo/examples/simpleplot/simpleplot.pro +++ b/third/qwtdemo/examples/simpleplot/simpleplot.pro @@ -6,9 +6,8 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -SOURCES = \ - simpleplot.cpp +SOURCES += simpleplot.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/sinusplot/sinusplot.pro b/third/qwtdemo/examples/sinusplot/sinusplot.pro index dd3a6f1..44eb516 100644 --- a/third/qwtdemo/examples/sinusplot/sinusplot.pro +++ b/third/qwtdemo/examples/sinusplot/sinusplot.pro @@ -6,9 +6,8 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -SOURCES = \ - sinusplot.cpp +SOURCES += sinusplot.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/spectrogram/spectrogram.pro b/third/qwtdemo/examples/spectrogram/spectrogram.pro index e29e409..ece50c4 100644 --- a/third/qwtdemo/examples/spectrogram/spectrogram.pro +++ b/third/qwtdemo/examples/spectrogram/spectrogram.pro @@ -6,13 +6,10 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - plot.h +HEADERS += plot.h +SOURCES += plot.cpp +SOURCES += main.cpp -SOURCES = \ - plot.cpp \ - main.cpp - -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/stockchart/stockchart.pro b/third/qwtdemo/examples/stockchart/stockchart.pro index 735a78c..5d96273 100644 --- a/third/qwtdemo/examples/stockchart/stockchart.pro +++ b/third/qwtdemo/examples/stockchart/stockchart.pro @@ -6,19 +6,17 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -HEADERS = \ - legend.h \ - griditem.h \ - plot.h \ - quotefactory.h +HEADERS += legend.h +HEADERS += griditem.h +HEADERS += plot.h +HEADERS += quotefactory.h -SOURCES = \ - legend.cpp \ - griditem.cpp \ - quotefactory.cpp \ - plot.cpp \ - main.cpp +SOURCES += legend.cpp +SOURCES += griditem.cpp +SOURCES += quotefactory.cpp +SOURCES += plot.cpp +SOURCES += main.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/sysinfo/sysinfo.pro b/third/qwtdemo/examples/sysinfo/sysinfo.pro index 1e60948..7a1da80 100644 --- a/third/qwtdemo/examples/sysinfo/sysinfo.pro +++ b/third/qwtdemo/examples/sysinfo/sysinfo.pro @@ -6,9 +6,8 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -SOURCES = \ - sysinfo.cpp +SOURCES += sysinfo.cpp -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri) diff --git a/third/qwtdemo/examples/tvplot/tvplot.pro b/third/qwtdemo/examples/tvplot/tvplot.pro index cf194d0..07dc98e 100644 --- a/third/qwtdemo/examples/tvplot/tvplot.pro +++ b/third/qwtdemo/examples/tvplot/tvplot.pro @@ -6,13 +6,10 @@ UI_DIR = temp/ui OBJECTS_DIR = temp/obj DESTDIR = $$PWD/../bin -SOURCES = \ - tvplot.cpp \ - main.cpp +HEADERS += tvplot.h +SOURCES += tvplot.cpp +SOURCES += main.cpp -HEADERS = \ - tvplot.h - -include ($$PWD/../../qwt/qwt.pri) INCLUDEPATH += $$PWD -INCLUDEPATH += $$PWD/../../qwt +INCLUDEPATH += $$PWD/../../../3rd_qwt +include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)