QtCreator: bump version

This commit is contained in:
Gerasim Troeglazov
2019-09-11 23:14:15 +10:00
parent d54153a24c
commit 8167c616c7
2 changed files with 18 additions and 18 deletions

View File

@@ -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 fb46370..2ad0435 100644
index 4d7f906..fdae422 100644
--- a/src/libs/sqlite/sqlite-lib.pri
+++ b/src/libs/sqlite/sqlite-lib.pri
@@ -6,7 +6,7 @@ shared {
@@ -71,12 +71,12 @@ index 376473d..85bbca1 100644
return 0;
}
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index cc78fdc..5e624ab 100644
index 52e3e19..35c7cb1 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -3,7 +3,7 @@ CONFIG += exceptions
@@ -4,7 +4,7 @@ CONFIG += exceptions
INCLUDEPATH += $$PWD
INCLUDEPATH += $$PWD/components
-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
+unix:!openbsd:!osx:!haiku: LIBS += -lrt # posix shared memory
@@ -84,7 +84,7 @@ index cc78fdc..5e624ab 100644
include(../../qtcreatorplugin.pri)
diff --git a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp
index 58a082f..808a15e 100644
index 04a061e..a384b3b 100644
--- a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp
+++ b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp
@@ -57,6 +57,8 @@
@@ -97,7 +97,7 @@ index 58a082f..808a15e 100644
# error Missing implementation of processNameByPid for this platform.
#endif
--
2.19.0
2.23.0
From bcb42768b4da408d8ba05f0be7f545cab428453f Mon Sep 17 00:00:00 2001
@@ -107,7 +107,7 @@ Subject: Fix rpath handling.
diff --git a/qtcreator.pro b/qtcreator.pro
index 2147403..c868f0e 100644
index e22433d..5f8dcf6 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) {
@@ -160,7 +160,7 @@ index d0c94a7..cc35826 100644
macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR}
}
--
2.19.0
2.23.0
From e508814ef963dcac9baa31049212e0c8ed636777 Mon Sep 17 00:00:00 2001
@@ -170,10 +170,10 @@ Subject: Enable Terminal on Haiku
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index 92b6995..510b852 100644
index 43afffa..7704640 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -333,6 +333,9 @@ void ConsoleProcess::stubExited()
@@ -334,6 +334,9 @@ void ConsoleProcess::stubExited()
Q_GLOBAL_STATIC_WITH_ARGS(const QVector<TerminalCommand>, knownTerminals, (
{
@@ -183,7 +183,7 @@ index 92b6995..510b852 100644
{"x-terminal-emulator", "", "-e"},
{"xterm", "", "-e"},
{"aterm", "", "-e"},
@@ -362,7 +365,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
@@ -363,7 +366,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
if (!result.isEmpty())
return {result, term.openArgs, term.executeArgs};
}
@@ -196,7 +196,7 @@ index 92b6995..510b852 100644
}
return defaultTerm;
diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp
index 7db05c2..0814fed 100644
index 77daae6..4940d3e 100644
--- a/src/libs/utils/unixutils.cpp
+++ b/src/libs/utils/unixutils.cpp
@@ -34,7 +34,11 @@ using namespace Utils;
@@ -212,5 +212,5 @@ index 7db05c2..0814fed 100644
QString UnixUtils::fileBrowser(const QSettings *settings)
--
2.19.0
2.23.0

View File

@@ -7,8 +7,8 @@ HOMEPAGE="https://www.qt.io/ide/"
COPYRIGHT="2019 The Qt Company Ltd"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.9/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="b7e0c797e7704c6c22eb35351946c0a758502fd082f6beaee043166e1739d3d7"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.10/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="8f5d3abc522d8b8879adfa098e037f751b4311173f5f443fd1b5800f5feb0f8a"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
PATCHES="qt_creator-$portVersion.patchset"
ADDITIONAL_FILES="qt_creator.rdef.in"
@@ -25,7 +25,7 @@ REQUIRES="
cmd:qdoc$secondaryArchSuffix >= 5
cmd:qmake$secondaryArchSuffix >= 5
lib:libGL$secondaryArchSuffix
lib:libLLVM_5.0$secondaryArchSuffix
lib:libLLVM_8$secondaryArchSuffix
lib:libQt5Concurrent$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Designer$secondaryArchSuffix
@@ -46,9 +46,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libclang$secondaryArchSuffix >= 5
devel:libclang$secondaryArchSuffix >= 8
devel:libGL$secondaryArchSuffix
devel:libLLVM_5.0$secondaryArchSuffix
devel:libLLVM_8$secondaryArchSuffix
devel:libQt5Concurrent$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Designer$secondaryArchSuffix