From 0aad8afc9088520ad95c17a67855d1aa55c93abf Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 21 Oct 2013 23:59:23 +0200 Subject: [PATCH 1/4] [OP-1085] upgraded to Qt 5.1.1 --- make/tools.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index a6377c580..1529e8925 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -71,7 +71,7 @@ else ifeq ($(UNAME), Darwin) DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz else ifeq ($(UNAME), Windows) ARM_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/gcc-arm-none-eabi-4_7-2013q1-20130313-windows.tar.bz2 - QT_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-5.1.0-windows.tar.bz2 + QT_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-5.1.1-windows.tar.bz2 NSIS_URL := http://wiki.openpilot.org/download/attachments/18612236/nsis-2.46-unicode.tar.bz2 UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2 @@ -81,7 +81,7 @@ GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0 # Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_7-2013q1 -QT_SDK_DIR := $(TOOLS_DIR)/qt-5.1.0 +QT_SDK_DIR := $(TOOLS_DIR)/qt-5.1.1 MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32 PYTHON_DIR := $(QT_SDK_DIR)/Tools/mingw48_32/opt/bin NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode @@ -306,7 +306,7 @@ endef ifeq ($(UNAME), Windows) -QT_SDK_PREFIX := $(QT_SDK_DIR)/5.1.0/mingw48_32 +QT_SDK_PREFIX := $(QT_SDK_DIR)/5.1.1/mingw48_32 define QT_SDK_CONFIGURE_TEMPLATE @$(ECHO) $(MSG_CONFIGURING) $(call toprel, $(QT_SDK_DIR)) From 6bfef53b813cf9067bccaa2e52296a0916e3c434 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 24 Oct 2013 00:09:01 +0200 Subject: [PATCH 2/4] [OP-1085] Qt5.1.1 - made curl report progress by default (can be switched off by adding BATCH=1 on make command line) --- make/tools.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 1529e8925..9dae10e86 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -177,15 +177,20 @@ MSG_NOTICE = $(QUOTE) NOTE $(QUOTE) # Verbosity level ifeq ($(V), 1) - CURL_OPTIONS := MAKE_SILENT := UNZIP_SILENT := else - CURL_OPTIONS := --silent MAKE_SILENT := --silent UNZIP_SILENT := -q endif +# Batch mode +ifeq ($(BATCH), 1) + CURL_OPTIONS := --silent +else + CURL_OPTIONS := +endif + # MSYS tar workaround ifeq ($(UNAME), Windows) TAR_OPTIONS := --force-local @@ -201,6 +206,7 @@ ifneq ($(strip $(filter $(addsuffix _install,all_sdk $(ALL_SDK_TARGETS)),$(MAKEC $(info $(EMPTY) NOTE Use 'make all_sdk_distclean' to remove installation files) $(info $(EMPTY) NOTE Use 'make all_sdk_version' to check toolchain versions) $(info $(EMPTY) NOTE Add 'V=1' to make command line to diagnose make problems) + $(info $(EMPTY) NOTE Add 'BATCH=1' to make command line to disable progress reporting during downloads) endif ############################## From f85498e7c5b4e61cd60762e8fdceef60b61514d5 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 23 Oct 2013 23:57:04 +0200 Subject: [PATCH 3/4] [OP-1085] Qt5.1.1 - a bit of manual uncrustifying --- .../src/plugins/antennatrack/antennatrackplugin.h | 3 ++- .../src/plugins/config/configplugin.h | 4 +--- .../src/plugins/coreplugin/coreplugin.h | 4 +++- .../src/plugins/debuggadget/debugplugin.h | 3 ++- ground/openpilotgcs/src/plugins/dial/dialplugin.h | 4 +++- .../src/plugins/emptygadget/emptyplugin.h | 4 +++- .../src/plugins/gcscontrol/gcscontrolplugin.h | 4 +++- .../src/plugins/gpsdisplay/gpsdisplayplugin.h | 4 +++- ground/openpilotgcs/src/plugins/hitl/hitlplugin.h | 4 +++- .../src/plugins/importexport/importexportplugin.h | 7 ++----- .../src/plugins/ipconnection/ipconnectionplugin.h | 15 ++++++--------- .../src/plugins/lineardial/lineardialplugin.h | 4 +++- .../src/plugins/logging/loggingplugin.h | 3 ++- .../plugins/magicwaypoint/magicwaypointplugin.h | 4 +++- .../src/plugins/modelview/modelviewplugin.h | 4 +++- .../src/plugins/notify/notifyplugin.h | 3 ++- .../src/plugins/ophid/inc/ophid_plugin.h | 5 ++--- .../openpilotgcs/src/plugins/opmap/opmapplugin.h | 4 +++- .../src/plugins/osgearthview/osgearthviewplugin.h | 4 +++- .../pathactioneditor/pathactioneditorplugin.h | 4 +++- .../src/plugins/pfdqml/pfdqmlplugin.h | 4 +++- .../src/plugins/qmlview/qmlviewplugin.h | 4 +++- .../openpilotgcs/src/plugins/scope/scopeplugin.h | 4 +++- .../src/plugins/serialconnection/serialplugin.h | 6 ++---- .../src/plugins/setupwizard/setupwizardplugin.h | 3 ++- .../src/plugins/systemhealth/systemhealthplugin.h | 4 +++- .../src/plugins/uavobjectbrowser/browserplugin.h | 4 +++- .../src/plugins/uavobjects/uavobjectsplugin.h | 2 +- .../plugins/uavobjectutil/uavobjectutilplugin.h | 2 +- .../uavobjectwidgetutilsplugin.h | 2 +- .../uavsettingsimportexport.h | 3 ++- .../src/plugins/uavtalk/uavtalkplugin.h | 2 +- .../src/plugins/uploader/uploaderplugin.h | 4 +++- .../src/plugins/welcome/welcomeplugin.h | 5 ++++- 34 files changed, 87 insertions(+), 53 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h b/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h index 46d7d428a..2ef36ff5e 100644 --- a/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h +++ b/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h @@ -7,7 +7,8 @@ class AntennaTrackGadgetFactory; class AntennaTrackPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack") + Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack") + public: AntennaTrackPlugin(); ~AntennaTrackPlugin(); diff --git a/ground/openpilotgcs/src/plugins/config/configplugin.h b/ground/openpilotgcs/src/plugins/config/configplugin.h index 340da99f5..d9360ceba 100644 --- a/ground/openpilotgcs/src/plugins/config/configplugin.h +++ b/ground/openpilotgcs/src/plugins/config/configplugin.h @@ -34,15 +34,13 @@ #include "uavtalk/telemetrymanager.h" #include "objectpersistence.h" - #include - class ConfigGadgetFactory; class ConfigPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Config") + Q_PLUGIN_METADATA(IID "OpenPilot.Config") public: ConfigPlugin(); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h index ddd4de647..3a7edad1b 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h @@ -33,11 +33,12 @@ namespace Core { namespace Internal { + class MainWindow; class CorePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Core") + Q_PLUGIN_METADATA(IID "OpenPilot.Core") public: CorePlugin(); @@ -53,6 +54,7 @@ public slots: private: MainWindow *m_mainWindow; }; + } // namespace Internal } // namespace Core diff --git a/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h b/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h index a4ffc9214..5f81c5616 100644 --- a/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h +++ b/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h @@ -34,7 +34,7 @@ class DebugGadgetFactory; class DebugPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Debug") + Q_PLUGIN_METADATA(IID "OpenPilot.Debug") public: DebugPlugin(); @@ -46,4 +46,5 @@ public: private: DebugGadgetFactory *mf; }; + #endif /* DEBUGPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/dial/dialplugin.h b/ground/openpilotgcs/src/plugins/dial/dialplugin.h index e42376de4..bae71391d 100644 --- a/ground/openpilotgcs/src/plugins/dial/dialplugin.h +++ b/ground/openpilotgcs/src/plugins/dial/dialplugin.h @@ -35,7 +35,8 @@ class DialGadgetFactory; class DialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Dial") + Q_PLUGIN_METADATA(IID "OpenPilot.Dial") + public: DialPlugin(); ~DialPlugin(); @@ -46,4 +47,5 @@ public: private: DialGadgetFactory *mf; }; + #endif /* DIALPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h b/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h index 7ae51b4db..495ce7d33 100644 --- a/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h +++ b/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h @@ -34,7 +34,8 @@ class EmptyGadgetFactory; class EmptyPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Empty") + Q_PLUGIN_METADATA(IID "OpenPilot.Empty") + public: EmptyPlugin(); ~EmptyPlugin(); @@ -45,4 +46,5 @@ public: private: EmptyGadgetFactory *mf; }; + #endif /* EMPTYPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h index e86820c3d..1a1312aca 100644 --- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h +++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h @@ -35,7 +35,8 @@ class GCSControlGadgetFactory; class GCSControlPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl") + Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl") + public: GCSControlPlugin(); ~GCSControlPlugin(); @@ -48,4 +49,5 @@ public: private: GCSControlGadgetFactory *mf; }; + #endif /* GCSControlPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h index 8652481f5..539dc3beb 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h @@ -34,7 +34,8 @@ class GpsDisplayGadgetFactory; class GpsDisplayPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay") + Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay") + public: GpsDisplayPlugin(); ~GpsDisplayPlugin(); @@ -45,4 +46,5 @@ public: private: GpsDisplayGadgetFactory *mf; }; + #endif /* GPSDISPLAYPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h b/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h index 30bde6c7f..bbbf25a8a 100644 --- a/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h +++ b/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h @@ -37,7 +37,8 @@ class HITLFactory; class HITLPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.HITL") + Q_PLUGIN_METADATA(IID "OpenPilot.HITL") + public: HITLPlugin(); ~HITLPlugin(); @@ -67,4 +68,5 @@ public: private: HITLFactory *mf; }; + #endif /* HITLPLUGIN_H */ diff --git a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h index ae91043f9..67364dc4a 100644 --- a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h +++ b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h @@ -32,7 +32,7 @@ class IMPORTEXPORT_EXPORT ImportExportPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport") + Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport") public: ImportExportPlugin(); @@ -46,8 +46,5 @@ private: private slots: void importExport(); }; + #endif /* IMPORTEXPORTPLUGIN_H_ */ -/** - * @} - * @} - */ diff --git a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h index d21b4e407..d84199978 100644 --- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h +++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h @@ -35,20 +35,20 @@ #include // #include - class QAbstractSocket; class QTcpSocket; class QUdpSocket; class IConnection; + /** * Define a connection via the IConnection interface * Plugin will add a instance of this class to the pool, * so the connection manager can use it. */ -class IPconnection_EXPORT IPconnectionConnection - : public Core::IConnection { +class IPconnection_EXPORT IPconnectionConnection : public Core::IConnection { Q_OBJECT + public: IPconnectionConnection(); virtual ~IPconnectionConnection(); @@ -69,7 +69,6 @@ public: return m_optionspage; } - protected slots: void onEnumerationChanged(); @@ -84,11 +83,10 @@ private: // QSettings* settings; }; - -class IPconnection_EXPORT IPconnectionPlugin - : public ExtensionSystem::IPlugin { +class IPconnection_EXPORT IPconnectionPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection") + Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection") + public: IPconnectionPlugin(); ~IPconnectionPlugin(); @@ -100,5 +98,4 @@ private: IPconnectionConnection *m_connection; }; - #endif // IPconnectionPLUGIN_H diff --git a/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h b/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h index ef5eba6ad..e2420d805 100644 --- a/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h +++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h @@ -34,7 +34,8 @@ class LineardialGadgetFactory; class LineardialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial") + Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial") + public: LineardialPlugin(); ~LineardialPlugin(); @@ -45,4 +46,5 @@ public: private: LineardialGadgetFactory *mf; }; + #endif /* LINEARDIALPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/logging/loggingplugin.h b/ground/openpilotgcs/src/plugins/logging/loggingplugin.h index 8f90c97d5..3f63c43ac 100644 --- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.h +++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.h @@ -113,7 +113,8 @@ private: class LoggingPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Logging") + Q_PLUGIN_METADATA(IID "OpenPilot.Logging") + public: LoggingPlugin(); ~LoggingPlugin(); diff --git a/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h b/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h index d93dfbe99..2eb3edbd3 100644 --- a/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h +++ b/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h @@ -34,7 +34,8 @@ class MagicWaypointGadgetFactory; class MagicWaypointPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint") + Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint") + public: MagicWaypointPlugin(); ~MagicWaypointPlugin(); @@ -45,4 +46,5 @@ public: private: MagicWaypointGadgetFactory *mf; }; + #endif /* GCSControlPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h b/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h index af3a7e858..44818423d 100644 --- a/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h +++ b/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h @@ -34,7 +34,8 @@ class ModelViewGadgetFactory; class ModelViewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "Openpilot.ModelView") + Q_PLUGIN_METADATA(IID "Openpilot.ModelView") + public: ModelViewPlugin(); ~ModelViewPlugin(); @@ -45,4 +46,5 @@ public: private: ModelViewGadgetFactory *mvf; }; + #endif /* MODELVIEWPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h index aac2a7736..33f08859a 100644 --- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h +++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h @@ -49,7 +49,8 @@ typedef struct { class SoundNotifyPlugin : public Core::IConfigurablePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify") + Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify") + public: SoundNotifyPlugin(); ~SoundNotifyPlugin(); diff --git a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h index fcb2e938c..fdc1dcb2f 100644 --- a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h +++ b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h @@ -81,10 +81,9 @@ protected: bool m_deviceOpened; }; -class OPHID_EXPORT RawHIDPlugin - : public ExtensionSystem::IPlugin { +class OPHID_EXPORT RawHIDPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.RawHID") + Q_PLUGIN_METADATA(IID "OpenPilot.RawHID") public: RawHIDPlugin(); diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h b/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h index bd8bee8fa..b3d00ac2a 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h +++ b/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h @@ -34,7 +34,8 @@ class OPMapGadgetFactory; class OPMapPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.OPMap") + Q_PLUGIN_METADATA(IID "OpenPilot.OPMap") + public: OPMapPlugin(); ~OPMapPlugin(); @@ -45,4 +46,5 @@ public: private: OPMapGadgetFactory *mf; }; + #endif /* OPMAP_PLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h b/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h index 7b229d2c2..2a85aaefb 100644 --- a/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h +++ b/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h @@ -34,7 +34,8 @@ class OsgEarthviewGadgetFactory; class OsgEarthviewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview") + Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview") + public: OsgEarthviewPlugin(); ~OsgEarthviewPlugin(); @@ -45,4 +46,5 @@ public: private: OsgEarthviewGadgetFactory *mf; }; + #endif /* PFDPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h index ba6d5b3f7..b43d32b59 100644 --- a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h +++ b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h @@ -33,7 +33,8 @@ class PathActionEditorGadgetFactory; class PathActionEditorPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor") + Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor") + public: PathActionEditorPlugin(); ~PathActionEditorPlugin(); @@ -44,4 +45,5 @@ public: private: PathActionEditorGadgetFactory *mf; }; + #endif /* PathActionEditorPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h index 7879b06f1..136523d5b 100644 --- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h +++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h @@ -23,7 +23,8 @@ class PfdQmlGadgetFactory; class PfdQmlPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml") + Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml") + public: PfdQmlPlugin(); ~PfdQmlPlugin(); @@ -34,4 +35,5 @@ public: private: PfdQmlGadgetFactory *mf; }; + #endif /* PFDQMLPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h b/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h index 6c4cdf733..ebb70c80c 100644 --- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h +++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h @@ -34,7 +34,8 @@ class QmlViewGadgetFactory; class QmlViewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.QmlView") + Q_PLUGIN_METADATA(IID "OpenPilot.QmlView") + public: QmlViewPlugin(); ~QmlViewPlugin(); @@ -45,4 +46,5 @@ public: private: QmlViewGadgetFactory *mf; }; + #endif /* QMLVIEWPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/scope/scopeplugin.h b/ground/openpilotgcs/src/plugins/scope/scopeplugin.h index f0e349df0..0875fd67a 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopeplugin.h +++ b/ground/openpilotgcs/src/plugins/scope/scopeplugin.h @@ -34,7 +34,8 @@ class ScopeGadgetFactory; class ScopePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Scope") + Q_PLUGIN_METADATA(IID "OpenPilot.Scope") + public: ScopePlugin(); ~ScopePlugin(); @@ -46,4 +47,5 @@ public: private: ScopeGadgetFactory *mf; }; + #endif /* SCOPEPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h index 8aa292bb1..ebaa363c0 100644 --- a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h +++ b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h @@ -116,10 +116,9 @@ protected: // class SERIAL_EXPORT SerialPlugin -class SerialPlugin - : public ExtensionSystem::IPlugin { +class SerialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Serial") + Q_PLUGIN_METADATA(IID "OpenPilot.Serial") public: SerialPlugin(); @@ -131,5 +130,4 @@ private: SerialConnection *m_connection; }; - #endif // SERIALPLUGIN_H diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h index 8bebd41a2..7be38727c 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h @@ -33,7 +33,8 @@ class SetupWizardPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard") + Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard") + public: SetupWizardPlugin(); ~SetupWizardPlugin(); diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h index 9a4fdb82f..808ed4b46 100644 --- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h +++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h @@ -34,7 +34,8 @@ class SystemHealthGadgetFactory; class SystemHealthPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth") + Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth") + public: SystemHealthPlugin(); ~SystemHealthPlugin(); @@ -45,4 +46,5 @@ public: private: SystemHealthGadgetFactory *mf; }; + #endif /* SYSTEMHEALTHPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h index 253477426..929662d1b 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h @@ -34,7 +34,8 @@ class UAVObjectBrowserFactory; class BrowserPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Browser") + Q_PLUGIN_METADATA(IID "OpenPilot.Browser") + public: BrowserPlugin(); ~BrowserPlugin(); @@ -45,4 +46,5 @@ public: private: UAVObjectBrowserFactory *mf; }; + #endif /* UAVOBJECTBROWSERPLUGIN_H_ */ diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h index a684dcc21..8c26b7152 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h @@ -36,7 +36,7 @@ class UAVOBJECTS_EXPORT UAVObjectsPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects") public: UAVObjectsPlugin(); diff --git a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h index ed3a20efc..fefc8ddf9 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h @@ -35,7 +35,7 @@ class UAVOBJECTUTIL_EXPORT UAVObjectUtilPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil") public: UAVObjectUtilPlugin(); diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h index dc988ef7f..c1a72f7f7 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h @@ -33,7 +33,7 @@ class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils") public: UAVObjectWidgetUtilsPlugin(); diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h index 08d92a114..9cb5f1cd8 100644 --- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h +++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h @@ -31,9 +31,10 @@ #include "uavobjectutil/uavobjectutilmanager.h" #include "uavsettingsimportexport_global.h" #include "uavsettingsimportexportfactory.h" + class UAVSETTINGSIMPORTEXPORT_EXPORT UAVSettingsImportExportPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport") public: UAVSettingsImportExportPlugin(); diff --git a/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h b/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h index 4d5aaa598..5b8840971 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h +++ b/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h @@ -38,7 +38,7 @@ class UAVTALK_EXPORT UAVTalkPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk") public: UAVTalkPlugin(); diff --git a/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h b/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h index 27fa2eae7..b9ea238b6 100644 --- a/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h +++ b/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h @@ -35,7 +35,8 @@ class UploaderGadgetFactory; class UPLOADER_EXPORT UploaderPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Uploader") + Q_PLUGIN_METADATA(IID "OpenPilot.Uploader") + public: UploaderPlugin(); ~UploaderPlugin(); @@ -46,4 +47,5 @@ public: private: UploaderGadgetFactory *mf; }; + #endif // UPLOADERPLUGIN_H diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h index a272d9550..337fdb57c 100644 --- a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h +++ b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h @@ -32,13 +32,15 @@ #include namespace Welcome { + class WelcomeMode; namespace Internal { + class WelcomePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Welcome") + Q_PLUGIN_METADATA(IID "OpenPilot.Welcome") public: WelcomePlugin(); @@ -51,6 +53,7 @@ public: private: WelcomeMode *m_welcomeMode; }; + } // namespace Welcome } // namespace Internal From d08445f0b54d7f5de95269b5db4fe9888f314452 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 26 Oct 2013 11:56:56 +0200 Subject: [PATCH 4/4] [OP-1085][OP-1094] Turn on Progress for large SDK downloads / remove for MD5 files This commit removes progress when downloading md5, adding progress for big files was committed as part of OP-1085 --- make/tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/tools.mk b/make/tools.mk index 9dae10e86..87538c320 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -240,7 +240,7 @@ $(1)_install: $(1)_clean | $(DL_DIR) $(TOOLS_DIR) @$(ECHO) $(MSG_VERIFYING) $$(call toprel, $(DL_DIR)/$(4)) $(V1) ( \ cd "$(DL_DIR)" && \ - $(CURL) $(CURL_OPTIONS) -o "$(DL_DIR)/$(4).md5" "$(3).md5" && \ + $(CURL) $(CURL_OPTIONS) --silent -o "$(DL_DIR)/$(4).md5" "$(3).md5" && \ if [ $(call MD5_CHECK_TEMPLATE,$(DL_DIR)/$(4),!=) ]; then \ $(ECHO) $(MSG_DOWNLOADING) $(3) && \ $(CURL) $(CURL_OPTIONS) -o "$(DL_DIR)/$(4)" "$(3)" && \