From 3f3012d837825bba22aedbec3e49ad00046134b8 Mon Sep 17 00:00:00 2001 From: James Duley Date: Tue, 6 Jan 2015 22:28:43 +1300 Subject: [PATCH 1/3] OP-1656 upgrade qt 5.4: make 5.2 the minimum compatible version --- ground/openpilotgcs/openpilotgcs.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/openpilotgcs.pro b/ground/openpilotgcs/openpilotgcs.pro index beedddc3c..aaf5edf05 100644 --- a/ground/openpilotgcs/openpilotgcs.pro +++ b/ground/openpilotgcs/openpilotgcs.pro @@ -11,8 +11,8 @@ QT_VERSION = $$split(QT_VERSION, ".") QT_VER_MAJ = $$member(QT_VERSION, 0) QT_VER_MIN = $$member(QT_VERSION, 1) -lessThan(QT_VER_MAJ, 5) | lessThan(QT_VER_MIN, 4) { - error(OpenPilot GCS requires Qt 5.4.0 or newer but Qt $$[QT_VERSION] was detected.) +lessThan(QT_VER_MAJ, 5) | lessThan(QT_VER_MIN, 2) { + error(OpenPilot GCS requires Qt 5.2.0 or newer but Qt $$[QT_VERSION] was detected.) } macx { From 1c680084f90a91acdb2ae08f1e75459b6de5bf57 Mon Sep 17 00:00:00 2001 From: James Duley Date: Wed, 7 Jan 2015 07:47:22 +1300 Subject: [PATCH 2/3] OP-1656 qt 5.4 upgrade: update python dir for qt creator --- ground/openpilotgcs/src/python.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri index 0ce268be5..016cfa4d3 100644 --- a/ground/openpilotgcs/src/python.pri +++ b/ground/openpilotgcs/src/python.pri @@ -1,7 +1,7 @@ # We use python to extract git version info and generate some other files, # but it may be installed locally. The expected python version should be # kept in sync with make/tools.mk. -PYTHON_DIR = qt-5.3.1/Tools/mingw482_32/opt/bin +PYTHON_DIR = qt-5.4.0/Tools/mingw491_32/opt/bin ROOT_DIR = $$GCS_SOURCE_TREE/../.. From 0b5188c9c3a059fe0e187237c6a40cf552a6dfd1 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 6 Jan 2015 22:24:01 +0100 Subject: [PATCH 3/3] OP-1654 Bracket missing --- ground/openpilotgcs/src/openpilotgcslibrary.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/openpilotgcslibrary.pri b/ground/openpilotgcs/src/openpilotgcslibrary.pri index 59791944d..4dbe647f5 100644 --- a/ground/openpilotgcs/src/openpilotgcslibrary.pri +++ b/ground/openpilotgcs/src/openpilotgcslibrary.pri @@ -12,7 +12,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/ -} else +} else { win32 { target.path = /bin target.files = $$DESTDIR/$${TARGET}.dll