rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merge branch 'filnet/qt5.1.1' into next

Browse Source
This commit is contained in:
Philippe Renon 2013-10-26 12:44:20 +02:00
commit dc2ee59850
35 changed files with 99 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h
View File

@ -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();

4
ground/openpilotgcs/src/plugins/config/configplugin.h
View File

@ -34,15 +34,13 @@
#include "uavtalk/telemetrymanager.h"
#include "objectpersistence.h"
#include <QMessageBox>
class ConfigGadgetFactory;
class ConfigPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Config")
Q_PLUGIN_METADATA(IID "OpenPilot.Config")
public:
ConfigPlugin();

4
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
View File

@ -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

3
ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/dial/dialplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
View File

@ -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 */

7
ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
View File

@ -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_ */
/**
* @}
* @}
*/

15
ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
View File

@ -35,20 +35,20 @@
#include <extensionsystem/iplugin.h>
// #include <QtCore/QSettings>
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

4
ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
View File

@ -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_ */

3
ground/openpilotgcs/src/plugins/logging/loggingplugin.h
View File

@ -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();

4
ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
View File

@ -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_ */

3
ground/openpilotgcs/src/plugins/notify/notifyplugin.h
View File

@ -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();

5
ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
View File

@ -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();

4
ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/scope/scopeplugin.h
View File

@ -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_ */

6
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
View File

@ -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

3
ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
View File

@ -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();

4
ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
View File

@ -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_ */

4
ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
View File

@ -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_ */

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
View File

@ -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();

2
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
View File

@ -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();

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
View File

@ -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();

3
ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
View File

@ -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();

2
ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
View File

@ -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();

4
ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
View File

@ -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

5
ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
View File

@ -32,13 +32,15 @@
#include <extensionsystem/iplugin.h>
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

18
make/tools.mk
View File

@ -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
@ -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
##############################
@ -234,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)" && \
@ -306,7 +312,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))