rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merged in m_thread/librepilot/LP-531-QT-5.9.0 (pull request #437)

Browse Source 
LP-531 Adds support for Qt 5.9.0

Approved-by: Philippe Renon <philippe_renon@yahoo.fr>
Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Brian Webb <webbbn@gmail.com>
Approved-by: Jan NIJS <dr.oblivium@gmail.com>
Approved-by: Paul Jewell <teulupaul@gmail.com>
Approved-by: Alessio Morale <alessiomorale@gmail.com>
This commit is contained in:
Fredrik Arvidsson 2017-06-26 07:45:09 +00:00
commit b29409b6ca
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
View File

@ -313,7 +313,7 @@ QString UAVObjectUtilManager::getBoardDescriptionString()
{ {
QByteArray arr = getBoardDescription(); QByteArray arr = getBoardDescription();
int index = arr.indexOf(255); int index = arr.indexOf((char)255);
return QString((index == -1) ? arr : arr.left(index)); return QString((index == -1) ? arr : arr.left(index));
} }

8
ground/gcs/src/plugins/uploader/dfu.cpp
View File

@ -365,7 +365,7 @@ QString DFUObject::DownloadDescription(int const & numberOfChars)
StartDownloadT(&arr, numberOfChars, DFU::Descript); StartDownloadT(&arr, numberOfChars, DFU::Descript);
int index = arr.indexOf(255); int index = arr.indexOf((char)255);
return QString((index == -1) ? arr : arr.left(index)); return QString((index == -1) ? arr : arr.left(index));
} }
@ -778,7 +778,7 @@ DFU::Status DFUObject::UploadFirmwareT(const QString &sfile, const bool &verify,
++pad; ++pad;
pad = pad * 4; pad = pad * 4;
pad = pad - arr.length(); pad = pad - arr.length();
arr.append(QByteArray(pad, 255)); arr.append(QByteArray(pad, (char)255));
} }
if (devices[device].SizeOfCode < (quint32)arr.length()) { if (devices[device].SizeOfCode < (quint32)arr.length()) {
if (debug) { if (debug) {
@ -884,7 +884,7 @@ DFU::Status DFUObject::CompareFirmware(const QString &sfile, const CompareType &
++pad; ++pad;
pad = pad * 4; pad = pad * 4;
pad = pad - arr.length(); pad = pad - arr.length();
arr.append(QByteArray(pad, 255)); arr.append(QByteArray(pad, (char)255));
} }
if (type == DFU::crccompare) { if (type == DFU::crccompare) {
quint32 crc = DFUObject::CRCFromQBArray(arr, devices[device].SizeOfCode); quint32 crc = DFUObject::CRCFromQBArray(arr, devices[device].SizeOfCode);
@ -1033,7 +1033,7 @@ quint32 DFUObject::CRCFromQBArray(QByteArray array, quint32 Size)
{ {
quint32 pad = Size - array.length(); quint32 pad = Size - array.length();
array.append(QByteArray(pad, 255)); array.append(QByteArray(pad, (char)255));
int num_words = Size / 4; int num_words = Size / 4;
quint32 *t = (quint32 *)malloc(Size); quint32 *t = (quint32 *)malloc(Size);
for (int x = 0; x < num_words; x++) { for (int x = 0; x < num_words; x++) {

18
make/tool_install/qt-install.qs
View File

@ -1,10 +1,10 @@
/* /*
Silent installer script Silent installer script
Known to work with Qt 5.8.0 and QtIFW 2.0.5 Known to work with Qt 5.9.0 and QtIFW 2.0.5
Test with: Test with:
$ ./qt-opensource-windows-x86-mingw530-5.8.0.exe --verbose --script ../librepilot/make/tool_install/qt-install.qs $ ./qt-opensource-windows-x86-mingw530-5.9.0.exe --verbose --script ../librepilot/make/tool_install/qt-install.qs
Known issues: Known issues:
- silent but not headless (QtIFW 2.1.0 should support gui.setSilent(true)) - silent but not headless (QtIFW 2.1.0 should support gui.setSilent(true))
@ -20,7 +20,7 @@ function Controller()
var qtInstallTargetDir = installer.environmentVariable("QT_INSTALL_TARGET_DIR"); var qtInstallTargetDir = installer.environmentVariable("QT_INSTALL_TARGET_DIR");
if (qtInstallTargetDir == "") { if (qtInstallTargetDir == "") {
qtInstallTargetDir = installer.environmentVariable("PWD") + "/tools/qt-5.8.0"; qtInstallTargetDir = installer.environmentVariable("PWD") + "/tools/qt-5.9.0";
console.log("Environment variable QT_INSTALL_TARGET_DIR not set, using default " + qtInstallTargetDir); console.log("Environment variable QT_INSTALL_TARGET_DIR not set, using default " + qtInstallTargetDir);
} }
installer.setValue("TargetDir", qtInstallTargetDir); installer.setValue("TargetDir", qtInstallTargetDir);
@ -107,18 +107,18 @@ Controller.prototype.ComponentSelectionPageCallback = function()
var page = gui.currentPageWidget(); var page = gui.currentPageWidget();
page.deselectAll() page.deselectAll()
if (installer.value("os") == "win") { if (installer.value("os") == "win") {
selectComponent(page, "qt.58.win32_mingw53"); selectComponent(page, "qt.59.win32_mingw53");
selectComponent(page, "qt.tools.win32_mingw530"); selectComponent(page, "qt.tools.win32_mingw530");
} }
else if (installer.value("os") == "x11") { else if (installer.value("os") == "x11") {
selectComponent(page, "qt.58.gcc"); selectComponent(page, "qt.59.gcc");
selectComponent(page, "qt.58.gcc_64"); selectComponent(page, "qt.59.gcc_64");
} }
else if (installer.value("os") == "mac") { else if (installer.value("os") == "mac") {
selectComponent(page, "qt.58.clang_64"); selectComponent(page, "qt.59.clang_64");
} }
//selectComponent(page, "qt.58.qtquickcontrols"); //selectComponent(page, "qt.59.qtquickcontrols");
selectComponent(page, "qt.58.qtscript"); selectComponent(page, "qt.59.qtscript");
gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);
} }

10
make/tools.mk
View File

@ -90,8 +90,8 @@ TOOLS_URL := http://librepilot.github.io/tools
# and are used only to install the tools on some OSes # and are used only to install the tools on some OSes
# don't assume actual versions to match # don't assume actual versions to match
QT_SHORT_VERSION := 5.8 QT_SHORT_VERSION := 5.9
QT_VERSION := 5.8.0 QT_VERSION := 5.9.0
OSG_VERSION := 3.5.5 OSG_VERSION := 3.5.5
OSGEARTH_VERSION := 2.8 OSGEARTH_VERSION := 2.8
@ -110,10 +110,10 @@ ifeq ($(UNAME), Linux)
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
QT_SDK_ARCH := clang_64 QT_SDK_ARCH := clang_64
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/qt-opensource-mac-x64-clang-$(QT_VERSION).dmg QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/qt-opensource-mac-x64-$(QT_VERSION).dmg
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/md5sums.txt QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/md5sums.txt
QT_SDK_MOUNT_DIR := /Volumes/qt-opensource-mac-x64-clang-$(QT_VERSION) QT_SDK_MOUNT_DIR := /Volumes/qt-opensource-mac-x64-$(QT_VERSION)
QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-clang-$(QT_VERSION)/qt-opensource-mac-x64-clang-$(QT_VERSION).app/Contents/MacOS/qt-opensource-mac-x64-clang-$(QT_VERSION) QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-$(QT_VERSION)/qt-opensource-mac-x64-$(QT_VERSION).app/Contents/MacOS/qt-opensource-mac-x64-$(QT_VERSION)
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
OSG_URL := $(TOOLS_URL)/osg-$(OSG_VERSION)-clang_64.tar.gz OSG_URL := $(TOOLS_URL)/osg-$(OSG_VERSION)-clang_64.tar.gz