From 0aad8afc9088520ad95c17a67855d1aa55c93abf Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 21 Oct 2013 23:59:23 +0200 Subject: [PATCH] [OP-1085] upgraded to Qt 5.1.1 --- make/tools.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index a6377c580..1529e8925 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -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 @@ -306,7 +306,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))