From 6aa8fd49f2d1113b68d68ae0d6bd8a5219bd83f0 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 16 Mar 2017 00:50:42 +0100 Subject: [PATCH] LP-491 upgrade to Qt 5.8.0 --- ground/gcs/src/libs/osgearth/copydata.pro | 4 ++- make/tool_install/qt-install.qs | 36 ++++++++++++++--------- make/tools.mk | 10 +++---- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro index c263520f5..18070984b 100644 --- a/ground/gcs/src/libs/osgearth/copydata.pro +++ b/ground/gcs/src/libs/osgearth/copydata.pro @@ -53,6 +53,7 @@ osg:win32 { librtmp-1.dll \ libgmp-10.dll \ libgnutls-30.dll \ + libunistring-2.dll \ libp11-kit-0.dll \ libffi-6.dll \ libtasn1-6.dll \ @@ -184,7 +185,8 @@ osgearth:win32 { libosgEarthAnnotation$${DS}.dll \ libosgEarthFeatures$${DS}.dll \ libosgEarthSymbology$${DS}.dll \ - libosgEarthUtil$${DS}.dll + libosgEarthUtil$${DS}.dll \ + libprotobuf.dll # gdal OSGEARTH_LIBS += \ diff --git a/make/tool_install/qt-install.qs b/make/tool_install/qt-install.qs index 4e98de846..441d7bbd9 100644 --- a/make/tool_install/qt-install.qs +++ b/make/tool_install/qt-install.qs @@ -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)) - cannot disable forced components (QtCreator, ...) - cannot disable virtual components (doc, examples, ...) @@ -17,7 +20,7 @@ function Controller() var qtInstallTargetDir = installer.environmentVariable("QT_INSTALL_TARGET_DIR"); 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); } installer.setValue("TargetDir", qtInstallTargetDir); @@ -65,6 +68,14 @@ onFinishedCalculateComponentsToInstall = function() //dumpComponents(); } +function disableComponent(componentName) +{ + component = installer.componentByName(componentName) + component.enabled = false + component.forcedInstallation = false + //component.setValue("ForcedInstallation", "false"); +} + // page callbacks // used to setup wizard pages and move the wizard forward @@ -96,25 +107,22 @@ Controller.prototype.ComponentSelectionPageCallback = function() var page = gui.currentPageWidget(); page.deselectAll() if (installer.value("os") == "win") { - selectComponent(page, "qt.56.win32_mingw492"); - selectComponent(page, "qt.tools.win32_mingw492"); + selectComponent(page, "qt.58.win32_mingw53"); + selectComponent(page, "qt.tools.win32_mingw530"); } else if (installer.value("os") == "x11") { - selectComponent(page, "qt.56.gcc"); - selectComponent(page, "qt.56.gcc_64"); + selectComponent(page, "qt.58.gcc"); + selectComponent(page, "qt.58.gcc_64"); } 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.56.qtscript"); - - //installer.componentByName("qt.tools.qtcreator").setValue("ForcedInstallation", "false"); + //selectComponent(page, "qt.58.qtquickcontrols"); + selectComponent(page, "qt.58.qtscript"); gui.clickButton(buttons.NextButton); } - function selectComponent(page, name) { component = installer.componentByName(name); diff --git a/make/tools.mk b/make/tools.mk index 366030b35..902be7aaf 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -90,8 +90,8 @@ TOOLS_URL := http://librepilot.github.io/tools # and are used only to install the tools on some OSes # don't assume actual versions to match -QT_SHORT_VERSION := 5.6 -QT_VERSION := 5.6.2 +QT_SHORT_VERSION := 5.8 +QT_VERSION := 5.8.0 OSG_VERSION := 3.5.5 OSGEARTH_VERSION := 2.8 @@ -119,8 +119,8 @@ else ifeq ($(UNAME), Darwin) OSG_URL := $(TOOLS_URL)/osg-$(OSG_VERSION)-clang_64.tar.gz OSGEARTH_URL := $(TOOLS_URL)/osgearth-$(OSGEARTH_VERSION)-clang_64.tar.gz else ifeq ($(UNAME), Windows) - QT_SDK_ARCH := mingw492_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_ARCH := mingw53_32 + 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 NSIS_URL := $(TOOLS_URL)/nsis-2.46-unicode.tar.bz2 MESAWIN_URL := $(TOOLS_URL)/mesawin.tar.gz @@ -349,7 +349,7 @@ endif ############################## define DOWNLOAD_TEMPLATE -@$(ECHO) $(MSG_VERIFYING) $$(call toprel, $(DL_DIR)/$(2)) + @$(ECHO) $(MSG_VERIFYING) $$(call toprel, $(DL_DIR)/$(2)) $(V1) ( \ cd "$(DL_DIR)" && \ $(CURL) $(CURL_OPTIONS) --silent -o "$(DL_DIR)/$(2).md5" "$(3)" && \