qt_creator: bump version.

This commit is contained in:
Jerome Duval
2018-10-09 22:23:27 +02:00
parent 1b472def0a
commit ca84b52532
2 changed files with 10 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
From f55dc3e97a105194be5af13aab08a9fadee66c6d Mon Sep 17 00:00:00 2001
From 5eabc92a95d831de7058735890742c99e6883455 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 15:42:32 +0200
Subject: apply patch from 4.1.0.
@@ -31,7 +31,7 @@ index 3959938..198a607 100644
osx {
CONFIG -= app_bundle
diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri
index 66905e6..510462d 100644
index fb46370..2ad0435 100644
--- a/src/libs/sqlite/sqlite-lib.pri
+++ b/src/libs/sqlite/sqlite-lib.pri
@@ -6,7 +6,7 @@ shared {
@@ -100,14 +100,14 @@ index 58a082f..808a15e 100644
2.19.0
From 8eb289497fff68e522e3b8778e208820f271f4ca Mon Sep 17 00:00:00 2001
From 20899fefeaf6c4351cae86f04908c3605af9efed Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 18:20:31 +0200
Subject: Fix rpath handling.
diff --git a/qtcreator.pro b/qtcreator.pro
index f52b6c2..753e2db 100644
index c432455..0136929 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) {
@@ -148,7 +148,7 @@ index 0d8911a..03c86f4 100644
+ QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
+}
diff --git a/src/shared/qbs/src/app/app.pri b/src/shared/qbs/src/app/app.pri
index 49bbd90..48730b8 100644
index d0c94a7..cc35826 100644
--- a/src/shared/qbs/src/app/app.pri
+++ b/src/shared/qbs/src/app/app.pri
@@ -7,6 +7,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START
@@ -163,7 +163,7 @@ index 49bbd90..48730b8 100644
2.19.0
From 51a8eb5a3313be6c68f1a59196e5a7a267894077 Mon Sep 17 00:00:00 2001
From c1801babe0ba7c01b57315ed4230b3fc8f0ef0a9 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 25 Jun 2018 16:18:26 +0300
Subject: Enable Terminal on Haiku
@@ -214,26 +214,3 @@ index 7db05c2..0814fed 100644
--
2.19.0
From 58c23b74dbe8854767466c78cb5611e5379bb581 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 8 Oct 2018 21:33:21 +0200
Subject: force QTC_FORCE_CLANG_LIBTOOLING with llvm 6.0
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 63ad0ad..10835c9 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -141,7 +141,7 @@ isEmpty(LLVM_VERSION) {
QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
isEmpty(QTC_NO_CLANG_LIBTOOLING) {
QTC_FORCE_CLANG_LIBTOOLING = $$(QTC_FORCE_CLANG_LIBTOOLING)
- versionIsEqual($$LLVM_VERSION, 5, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) {
+ versionIsEqual($$LLVM_VERSION, 6, 0)|isEmpty(QTC_FORCE_CLANG_LIBTOOLING) {
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
--
2.19.0

View File

@@ -6,9 +6,9 @@ such as Android and iOS."
HOMEPAGE="https://www.qt.io/ide/"
COPYRIGHT="2018 The Qt Company Ltd"
LICENSE="GNU GPL v3"
REVISION="2"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.6/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.7/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
PATCHES="qt_creator-$portVersion.patchset"
ADDITIONAL_FILES="qt_creator.rdef.in"
@@ -68,6 +68,7 @@ BUILD_PREREQUIRES="
cmd:llvm_config >= 6
cmd:make
cmd:qmake$secondaryArchSuffix >= 5
cmd:python2
"
BUILD()