rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

LP-491 upgrade to Qt 5.8.0

Browse Source
This commit is contained in:
Philippe Renon 2017-03-16 00:50:42 +01:00
parent 2bbd63946b
commit 6aa8fd49f2
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -53,6 +53,7 @@ osg:win32 {
librtmp-1.dll \ librtmp-1.dll \
libgmp-10.dll \ libgmp-10.dll \
libgnutls-30.dll \ libgnutls-30.dll \
libunistring-2.dll \
libp11-kit-0.dll \ libp11-kit-0.dll \
libffi-6.dll \ libffi-6.dll \
libtasn1-6.dll \ libtasn1-6.dll \
@ -184,7 +185,8 @@ osgearth:win32 {
libosgEarthAnnotation$${DS}.dll \ libosgEarthAnnotation$${DS}.dll \
libosgEarthFeatures$${DS}.dll \ libosgEarthFeatures$${DS}.dll \
libosgEarthSymbology$${DS}.dll \ libosgEarthSymbology$${DS}.dll \
libosgEarthUtil$${DS}.dll libosgEarthUtil$${DS}.dll \
libprotobuf.dll
# gdal # gdal
OSGEARTH_LIBS += \ OSGEARTH_LIBS += \

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

@ -1,9 +1,12 @@
/* /*
silent installer script Silent installer script
known to work with Qt 5.6.0 and QtIFW 2.1.0 Known to work with Qt 5.8.0 and QtIFW 2.0.5
known issues: Test with:
$ ./qt-opensource-windows-x86-mingw530-5.8.0.exe --verbose --script ../librepilot/make/tool_install/qt-install.qs
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))
- cannot disable forced components (QtCreator, ...) - cannot disable forced components (QtCreator, ...)
- cannot disable virtual components (doc, examples, ...) - cannot disable virtual components (doc, examples, ...)
@ -17,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.6.0"; qtInstallTargetDir = installer.environmentVariable("PWD") + "/tools/qt-5.8.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);
@ -65,6 +68,14 @@ onFinishedCalculateComponentsToInstall = function()
//dumpComponents(); //dumpComponents();
} }
function disableComponent(componentName)
{
component = installer.componentByName(componentName)
component.enabled = false
component.forcedInstallation = false
//component.setValue("ForcedInstallation", "false");
}
// page callbacks // page callbacks
// used to setup wizard pages and move the wizard forward // used to setup wizard pages and move the wizard forward
@ -96,25 +107,22 @@ 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.56.win32_mingw492"); selectComponent(page, "qt.58.win32_mingw53");
selectComponent(page, "qt.tools.win32_mingw492"); selectComponent(page, "qt.tools.win32_mingw530");
} }
else if (installer.value("os") == "x11") { else if (installer.value("os") == "x11") {
selectComponent(page, "qt.56.gcc"); selectComponent(page, "qt.58.gcc");
selectComponent(page, "qt.56.gcc_64"); selectComponent(page, "qt.58.gcc_64");
} }
else if (installer.value("os") == "mac") { else if (installer.value("os") == "mac") {
selectComponent(page, "qt.56.clang_64"); selectComponent(page, "qt.58.clang_64");
} }
selectComponent(page, "qt.56.qtquickcontrols"); //selectComponent(page, "qt.58.qtquickcontrols");
selectComponent(page, "qt.56.qtscript"); selectComponent(page, "qt.58.qtscript");
//installer.componentByName("qt.tools.qtcreator").setValue("ForcedInstallation", "false");
gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);
} }
function selectComponent(page, name) function selectComponent(page, name)
{ {
component = installer.componentByName(name); component = installer.componentByName(name);

8
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.6 QT_SHORT_VERSION := 5.8
QT_VERSION := 5.6.2 QT_VERSION := 5.8.0
OSG_VERSION := 3.5.5 OSG_VERSION := 3.5.5
OSGEARTH_VERSION := 2.8 OSGEARTH_VERSION := 2.8
@ -119,8 +119,8 @@ else ifeq ($(UNAME), Darwin)
OSG_URL := $(TOOLS_URL)/osg-$(OSG_VERSION)-clang_64.tar.gz OSG_URL := $(TOOLS_URL)/osg-$(OSG_VERSION)-clang_64.tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-$(OSGEARTH_VERSION)-clang_64.tar.gz OSGEARTH_URL := $(TOOLS_URL)/osgearth-$(OSGEARTH_VERSION)-clang_64.tar.gz
else ifeq ($(UNAME), Windows) else ifeq ($(UNAME), Windows)
QT_SDK_ARCH := mingw492_32 QT_SDK_ARCH := mingw53_32
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/qt-opensource-windows-x86-mingw492-$(QT_VERSION).exe QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/qt-opensource-windows-x86-mingw530-$(QT_VERSION).exe
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
NSIS_URL := $(TOOLS_URL)/nsis-2.46-unicode.tar.bz2 NSIS_URL := $(TOOLS_URL)/nsis-2.46-unicode.tar.bz2
MESAWIN_URL := $(TOOLS_URL)/mesawin.tar.gz MESAWIN_URL := $(TOOLS_URL)/mesawin.tar.gz