mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
QtCreator: bump version, switch to Qt6
This commit is contained in:
Gerasim Troeglazov
@@ -15,7 +15,7 @@ resource app_version {
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV";
|
||||
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "text/x-jamfile",
|
||||
@@ -25,78 +25,34 @@ resource file_types message {
|
||||
};
|
||||
|
||||
resource vector_icon {
|
||||
$"6E63696614050004007B02000602BB9A3630533AB1442BBC87C2487A614AA5A5"
|
||||
$"00187F00FF5EFF0602000602BB36352DFCE8ACFF49BA69F34ADB2F4AC4240064"
|
||||
$"7F00FF00FF0002000602BCA6EC352109B52109BCA6EC4A4484493EFA00187F00"
|
||||
$"FF00FF0005FF0341CD51030DA21E037BF08905FF0341CD5105FF04005F050004"
|
||||
$"017303040E0B020016023F09703F2185BF21853F09704C7033C965EB008DFFFF"
|
||||
$"02001602380C29BE16A33E16A3380C29CA591E498A3D00C0FFFF020016023CE2"
|
||||
$"B83D22E1BD22E13CE2B8462D1EC30B85006AFFFF020106023EFB25BA19AC372E"
|
||||
$"5A3C41ED4B02FF494A2100C7DCFFFF0534BD0D060FFABEBE2FB7B7B33CB391B5"
|
||||
$"F3B386B640B386B640B2E9BAC6B386C521B2E9BFC8B386C521B38EC565B3C3C5"
|
||||
$"90B3C3C590B821C932C0F0CE7138CC2FC0F0CE71C147CE9EC5C0CBB2C5CCCB65"
|
||||
$"C5CCCB65C669C6DDC5CCBC83C669C1DBC5CCBC83C5C3BC40C58FBC14C58FBC14"
|
||||
$"C132B873B862B334BCC3B576B862B334B80BB3070607EE22C1DCC4B5C59EC601"
|
||||
$"C48FC59CC894C71ECC3CCA8AC9D3CCA1CB1ECBC5C83A63C4B0CE92C15EC532CB"
|
||||
$"010204B430B656B394BAD5B889B895C13EBF23BCE4BB84C1D9C472C13ECDDAC1"
|
||||
$"D9C95ABCE4CB9A234EB88CC8F1B395C0030206C5225DC5225DC5BEC6D0C522BC"
|
||||
$"97C5BEC1E8C0C8B8F9B814B3CBBC6EB609B814B3CBB430B656B430B656B889B8"
|
||||
$"95C13EBF23BCE4BB84C1D9C472C13ECDDAC1D9C95AC13ECDDA0204C522BC97C5"
|
||||
$"22BC97C0C8B8F9B814B3CBBC6EB609B814B3CBB430B656B430B656B889B895C1"
|
||||
$"3EBF23BCE4BB84C13EBF23020FBC2CB859BB362FBD4FB799C00CB76ABEB6B768"
|
||||
$"C152B76EC3B4B86BC2A6B7A8C477B8F3C54CBAA4C4F7B9C8C5D5BC0EC603BF12"
|
||||
$"C5FEBD92C603C094C571C38FC5F1C220C51CC489C3A2C603C478C569C43CC6FE"
|
||||
$"C575C8F0C4DAC7F6C4B3C94BC32DC9FFC3F0C9A4C289C8ECC13EC6CAC1E3C7DA"
|
||||
$"C05CC6EEBE95C6D2BF7652BD85C6B3BBA0C5A9BC72C660BB01C51FBA56C397BA"
|
||||
$"9CC45BB9E6C247B9C3BF84B9C7C0E3B9C0BE0ABA4ABB1DB9D7BC88BAA2BA0A02"
|
||||
$"12C90EB84DC90DB959C9D9B84DCB70B84DCAA5B84DCB71B959CB71BB74CB70BA"
|
||||
$"67CC76BB7465BB74CD7ABB74CE7ABC22CE70BD80CE75BCD1CD6CBD81CB64BD81"
|
||||
$"CC67BD80CB65BF39CB65C2ABCB6343CB69C324CB9CC413CB67C3A4CBC4C46A60"
|
||||
$"C483CC2CC480CD20C483CE61C475CDC0C478CE6CC51765C657CE75C5B8CD3FC6"
|
||||
$"8DCAB4C66ACBF0C6CECA2EC641C97CC566C9B2C5EAC91BC485C90EC29AC913C3"
|
||||
$"8AC90DC0E7C90EBD81C90EBF33C881BD80C765BD80C7F2BD81C765BCD1C765BB"
|
||||
$"74C765BC22C7F2BB74C90DBB74C881BB75C90EBA67020CBF09B993BE70B9A9BF"
|
||||
$"CFB97944B9CAC09EB981C1F1BA06C2B5BB11C270BA7BC31EBBF2C359BDDFC345"
|
||||
$"BCEAC36FBF27C33EC1B6C36CC071C320C276C270C3DAC2F2C342C1EBC473C059"
|
||||
$"C4C5C11EC4B6BF8AC4D4BDF4C463BEAFC4C5BD86C428BCF4C35DBD29C3CEBCB2"
|
||||
$"C2D7BC75C1B4BC8EC245BC28BFE3BC7EBC36BC15BE03BCA9BB88BD67BA52BCE8"
|
||||
$"BAD5BDD6B9E2020F3827BB98B6693B2641283E274429C3B4B86B462A4E314E33"
|
||||
$"C4FFB9B6C5DCBBF9C603BF12C5FEBD92C603C094C571C38FC5F1C220C51CC489"
|
||||
$"C3A2C603C478C569C43CC6FEC575C8F0C4DAC7F6C4B3C94BC32DC9FFC3F0C9A4"
|
||||
$"C289C8ECC13EC6CAC1E3C7DAC05CC6EE3D4FBF6FC5D2BD7FC599354ABC2DC471"
|
||||
$"BABCC3303245BA6FC283B9BAC06F313BB9CABF1FB9C3BC45322D3035BA84B71B"
|
||||
$"0212C90EB84DC90DB959C9D9B84DCB70B84DCAA5B84DCB71B959CB71BB74CB70"
|
||||
$"BA67603665396238653E653ECE81BE44613CCB64BD81613CCB65BF39CB65C2AB"
|
||||
$"CB6343CB69C324CB9CC413CB67C3A4CBC4C46A604DCC2AC4EBCD1FC4ED654FCD"
|
||||
$"DDC5BBCE86C6596555CE74C77D61545B515F54C9FCC65DC97CC566C9B2C5EAC9"
|
||||
$"1BC485C90EC29AC913C38AC90DC0E7573857BE42553653355536C751BAAE5330"
|
||||
$"C751BA0E55315733563257B984020C3D2DBDF4B8423F2D432F412E4531C2B5BB"
|
||||
$"114632C31EBBF2C359BDDF4939C36FBF27C33EC1B6C36CC071C320C2764749C3"
|
||||
$"0BC2BD464B434C464C404C3C4ABEE3C41EBDB9C3813A47BD91C2F8BD1AC20438"
|
||||
$"43BCA9C184BC43BF223737373C3733392E38313B2D0216B82ABEFCB82ABEFCB9"
|
||||
$"F4C1BDBE99C312BC2DC2EFBE47C2B2BE17C1FBBE2DC24DC05BC419C305C21AC2"
|
||||
$"14C285C2CBC1D0C204C118C26BC1E9C2B4C15CC3D5C195C32DC16FC455C14AC5"
|
||||
$"81C0C2C505C121C61BC04CC784BF22C6E1BFABC73EBEDDC727BE67C737BEADC7"
|
||||
$"6EBE8BC800BEB6C7B5BEA6C88FBE0EC9BDBD9FC947BDBAC826BC9DC43EBC25C5"
|
||||
$"ECBC2EC39CBC7BC317BE0AC37EBD16C2DCBD84C333BC34C2D5BCECC1FEBC4CBF"
|
||||
$"9FBCC9C0CABC87BF2ABCE2BD5BBD79BDFEBD61BCFBBDD6BC62BE87BCA9BE2FBC"
|
||||
$"73BE2BBC95BD71BC79BDCEBA94BD4DB7F3BE62B966BD93B55DBDCAB37BBC30B3"
|
||||
$"7BBC30B37BBC30B346BD1DB346BD1DB346BD1DB82BBEFCB583BE85B82BBEFC02"
|
||||
$"16B842BF29B842BF29BA09C1CABE98C301BC39C2E8BE47C2A6BE16C1F6BE2CC2"
|
||||
$"45C053C3F8C2E8C203C1FEC26DC2AFC1BCC1EAC10EC251C1D5C297C14CC3B2C1"
|
||||
$"80C30DC15DC42EC136C552C0AEC4DAC10CC5E7C03BC745BF17C6A7BF9DC6FFBE"
|
||||
$"D6C6E8BE64C6F9BEA7C72DBE86C7BCBEADC773BE9FC846BE09C96CBD9BC8FABD"
|
||||
$"B6C7DBBCA8C409BC42C5ADBC45C36BBC98C2EEBE19C34FBD2DC2B2BD9AC304BC"
|
||||
$"54C2AABD07C1D5BC70BF86BCF1C0A9BCAEBF13BD0BBD50BDA3BDF0BD89BCF4BD"
|
||||
$"FDBC60BEAABCA4BE54BC6FBE51BC8FBD9DBC74BDF7BA99BD81B80ABE96B973BD"
|
||||
$"C9B580BE0DB3A4BC89B3A4BC89B3A4BC89B373BD6EB373BD6EB373BD6EB843BF"
|
||||
$"29B5A8BEC1B843BF290B0A000100023F9EAB0000000000003FA74447015A3159"
|
||||
$"460A010101023F9EAB0000000000003FA74447015A3159460A060102023F9EAB"
|
||||
$"0000000000003FA74447015A3159460A070103023F9EAB0000000000003FA744"
|
||||
$"47015A3159460A080104023F9EAB0000000000003FA74447015A3159460A0B01"
|
||||
$"08023D3D920000000000003E20FB46CDF447A00C0A0B0109023D3D9200000000"
|
||||
$"00003E20FB46CDF448F5FF0A0A010A023D3D920000000000003E20FB46CDF447"
|
||||
$"A00C0A0C010C02BEE54EBB9E26BB64B13F294C4B567B4A68600A0F010B12BEE5"
|
||||
$"4EBB9E26BB64B13F294C4B167B4A286001178200040A13010C02BEE54EBB9E26"
|
||||
$"BB64B13F294C4B167B4A2860"
|
||||
$"6E6369660E0500020006023E488C3D5166BB6D423C5BB8C08269C3C03C0080FF"
|
||||
$"80FF04AB04020006023B27AF3C3553BC5F383B638B4A4E284413FE00C0ECC0FF"
|
||||
$"27F527020006023B400638C45EBA48923CAE9D4A8D5F483C000105CE05FF026C"
|
||||
$"02020006023B5AF83C2ADEB96D4C38A70E489F97489C4000FFFFFFFFBBDAB104"
|
||||
$"005F011A171B660554020016020000003CC4CBBCC4CB0000004E30CB49FD6400"
|
||||
$"FFFFE505FF02000602B701CCBB62683C6BDEB826C04AB6094B57BA000592DBFF"
|
||||
$"EFEFEF02001202BA6CCC3A0968BA0968BA6CCC4A53E84A32F700FFFFFFFF0002"
|
||||
$"001202B9234C3A63AFBA63AFB9234C4A9E8D4A901E00FFFFFFFF00059F0E0608"
|
||||
$"EEEE2827392D3029C01EB9944A354C484C3C4C534A5C3755455CB7B2C5E2284B"
|
||||
$"26392648262B0606BA0E282733234227BD0DB458532E53304A35392DC03FB9B9"
|
||||
$"B9E1B6BC0606AE0B4A5C4B474BC81D4B3E4A3553305542553555505354020438"
|
||||
$"4238383849314ABBB1C4B12B472C3A2C402C333233B8EFBA1237350802344638"
|
||||
$"4E0404B6413C4D4253BFFDC6C34354445408023E4245450605BA024A5E575D60"
|
||||
$"516052604F554D54540605FF02455A455AC11FC76CC20BC4DFC109C667C375C2"
|
||||
$"BACBD1BDE0C7A4C2CEC96EC3D7485BCB43CADF485BC211CA600605FF02455A45"
|
||||
$"5AC11FC76CC20BC4DFC109C667C375C2BACBD1BDE0C7A4C2CEC96EC3D7485BCB"
|
||||
$"43CADF485BC211CA600605FF02455A455AC11FC76CC20BC4DFC109C667C375C2"
|
||||
$"BACBD1BDE0C7A4C2CEC96EC3D7485BCB43CADF485BC211CA600605FF01C211CA"
|
||||
$"0EC211CA0EC60FC537CA48C002CA48C002C5ECC338C25EC4CDC374C36FC115C6"
|
||||
$"6AC211CA0EC1D1C917C211CA0ECA0E0605BF02C287CA2BC287CA2BC50FC71CCA"
|
||||
$"1FC0FEC797C40DC9FBC241C7C2C85CC986C67BC5D9CA63C287CA2BC287CA2B06"
|
||||
$"047BC27BCA02C27BCA02C2B0CA1ACA19C0A6C27BCA02C252C964C27BCA02CA02"
|
||||
$"0D0A050107201D200A0003000102301D2001178522040A020101201D200A0301"
|
||||
$"02201D200A010100201D200A050403040506123FFFFF000000000000400CFCC3"
|
||||
$"FFFFBD288E01178522040A040403040506301D2001178322040A090108123F0E"
|
||||
$"9F0000000000003F979547240D45337501178922040A070109123F0E9F000000"
|
||||
$"0000003F979547240D45337501178522040A0A010A023F0E9F0000000000003F"
|
||||
$"979547240D4533750A0B010B023F0E9F0000000000003F979547240D4533750A"
|
||||
$"0C010C023F0E9F0000000000003F979547240D4533750A0D010D023F0E9F0000"
|
||||
$"000000003F979547240D453375"
|
||||
};
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
From fedfecc4f277eccc2688161c917fd22ec54da05f Mon Sep 17 00:00:00 2001
|
||||
From d3b12ed3c57773cf953335e6a489e0ee0bc16c90 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.
|
||||
|
||||
|
||||
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
|
||||
index 93e6e78..514d6e5 100644
|
||||
index 8b1221a..78d984a 100644
|
||||
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
|
||||
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
|
||||
@@ -47,7 +47,7 @@
|
||||
@@ -18,10 +18,10 @@ index 93e6e78..514d6e5 100644
|
||||
#elif defined(Q_OS_WIN)
|
||||
SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS);
|
||||
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
|
||||
index 940047c..79ed19a 100644
|
||||
index 0b364d3..592133a 100644
|
||||
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
|
||||
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
|
||||
@@ -30,7 +30,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc
|
||||
@@ -34,7 +34,7 @@ else: RESOURCES += $$PWD/../editor3d_qt5.qrc
|
||||
|
||||
DISTFILES += Info.plist
|
||||
|
||||
@@ -31,7 +31,7 @@ index 940047c..79ed19a 100644
|
||||
osx {
|
||||
CONFIG -= app_bundle
|
||||
diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri
|
||||
index fd02c88..6ea88c1 100644
|
||||
index f1248cd..f938e76 100644
|
||||
--- a/src/libs/sqlite/sqlite-lib.pri
|
||||
+++ b/src/libs/sqlite/sqlite-lib.pri
|
||||
@@ -6,7 +6,7 @@ shared {
|
||||
@@ -43,17 +43,8 @@ index fd02c88..6ea88c1 100644
|
||||
|
||||
include(../3rdparty/sqlite/sqlite.pri)
|
||||
|
||||
@@ -60,7 +60,7 @@ DEFINES += SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY \
|
||||
SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA \
|
||||
SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_NULL_TRIM SQLITE_OMIT_EXPLAIN \
|
||||
SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_UTF16 SQLITE_DQS=0 \
|
||||
- SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_FDATASYNC HAVE_MALLOC_USABLE_SIZE \
|
||||
+ SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_MALLOC_USABLE_SIZE \
|
||||
SQLITE_DEFAULT_MMAP_SIZE=268435456 SQLITE_CORE SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK \
|
||||
SQLITE_LIKE_DOESNT_MATCH_BLOBS
|
||||
|
||||
diff --git a/src/libs/utils/process_stub_unix.c b/src/libs/utils/process_stub_unix.c
|
||||
index ef5921b..9be08ad 100644
|
||||
index 1cb3e8a..245e901 100644
|
||||
--- a/src/libs/utils/process_stub_unix.c
|
||||
+++ b/src/libs/utils/process_stub_unix.c
|
||||
@@ -1,3 +1,4 @@
|
||||
@@ -61,7 +52,7 @@ index ef5921b..9be08ad 100644
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
@@ -174,8 +175,10 @@ static void sigchldHandler(int sig)
|
||||
@@ -135,8 +136,10 @@ static void sigchldHandler(int sig)
|
||||
|
||||
/* syntax: $0 {"run"|"debug"} <pid-socket> <continuation-msg> <workdir> <env-file> <exe> <args...> */
|
||||
/* exit codes: 0 = ok, 1 = invocation error, 3 = internal error */
|
||||
@@ -72,7 +63,7 @@ index ef5921b..9be08ad 100644
|
||||
int errNo, hadInvalidCommand = 0;
|
||||
char **env = 0;
|
||||
struct sockaddr_un sau;
|
||||
@@ -366,5 +369,6 @@ int main(int argc, char *argv[])
|
||||
@@ -358,5 +361,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
assert(0);
|
||||
@@ -80,7 +71,7 @@ index ef5921b..9be08ad 100644
|
||||
return 0;
|
||||
}
|
||||
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
|
||||
index 8f34f42..e95e673 100644
|
||||
index 78fe856..bc72e8d 100644
|
||||
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
|
||||
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
|
||||
@@ -4,7 +4,7 @@ CONFIG += exceptions
|
||||
@@ -106,17 +97,17 @@ index b27592f..ca5fcd6 100644
|
||||
# error Missing implementation of processNameByPid for this platform.
|
||||
#endif
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 92fc6a3d1da896e35097fa2fcd0a47c206e447b8 Mon Sep 17 00:00:00 2001
|
||||
From b4777cbfd48da52d1ba478af52aba92fbe6341fd 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 d2e9a74..53272c6 100644
|
||||
index 5666948..f8dc86b 100644
|
||||
--- a/qtcreator.pro
|
||||
+++ b/qtcreator.pro
|
||||
@@ -46,7 +46,7 @@ exists(src/shared/qbs/qbs.pro) {
|
||||
@@ -156,20 +147,20 @@ index 5cd9cb4..818df42 100644
|
||||
macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR}
|
||||
}
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 875cab3924140f4651af21d5ccf1e6cec128cf34 Mon Sep 17 00:00:00 2001
|
||||
From fcc84f8696c455ab507c70f290a82747caf5f3dc 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
|
||||
|
||||
|
||||
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
|
||||
index 7fe624a..5143feb 100644
|
||||
index d0979ac..9f61a01 100644
|
||||
--- a/src/libs/utils/consoleprocess.cpp
|
||||
+++ b/src/libs/utils/consoleprocess.cpp
|
||||
@@ -149,6 +149,9 @@ void ConsoleProcess::setSettings(QSettings *settings)
|
||||
@@ -151,6 +151,9 @@ void ConsoleProcess::setSettings(QSettings *settings)
|
||||
|
||||
Q_GLOBAL_STATIC_WITH_ARGS(const QVector<TerminalCommand>, knownTerminals, (
|
||||
{
|
||||
@@ -179,7 +170,7 @@ index 7fe624a..5143feb 100644
|
||||
{"x-terminal-emulator", "", "-e"},
|
||||
{"xdg-terminal", "", "", true},
|
||||
{"xterm", "", "-e"},
|
||||
@@ -176,7 +179,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
|
||||
@@ -178,7 +181,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
|
||||
defaultTerm = {"/usr/X11/bin/xterm", "", "-e"};
|
||||
|
||||
} else if (HostOsInfo::isAnyUnixHost()) {
|
||||
@@ -192,10 +183,10 @@ index 7fe624a..5143feb 100644
|
||||
for (const TerminalCommand &term : *knownTerminals) {
|
||||
const QString result = env.searchInPath(term.command).toString();
|
||||
diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp
|
||||
index 77daae6..4940d3e 100644
|
||||
index 535bfa2..035ec66 100644
|
||||
--- a/src/libs/utils/unixutils.cpp
|
||||
+++ b/src/libs/utils/unixutils.cpp
|
||||
@@ -34,7 +34,11 @@ using namespace Utils;
|
||||
@@ -36,7 +36,11 @@ using namespace Utils;
|
||||
|
||||
QString UnixUtils::defaultFileBrowser()
|
||||
{
|
||||
@@ -208,20 +199,20 @@ index 77daae6..4940d3e 100644
|
||||
|
||||
QString UnixUtils::fileBrowser(const QSettings *settings)
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 93b3ab69e4bbc823dd95f02e2612ddf7583f7739 Mon Sep 17 00:00:00 2001
|
||||
From 7cd8e150fb5f9184742d678d486366662485274c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 May 2020 14:42:59 +1000
|
||||
Subject: Don't using Manhattan style for QMenu and QMenuBar
|
||||
|
||||
|
||||
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
|
||||
index 6fb5e17..a434a19 100644
|
||||
index d2043b7..a8de63c 100644
|
||||
--- a/src/plugins/coreplugin/mainwindow.cpp
|
||||
+++ b/src/plugins/coreplugin/mainwindow.cpp
|
||||
@@ -135,6 +135,9 @@ MainWindow::MainWindow()
|
||||
@@ -144,6 +144,9 @@ MainWindow::MainWindow()
|
||||
&& baseName == QLatin1String("windows")) {
|
||||
baseName = QLatin1String("fusion");
|
||||
}
|
||||
@@ -231,19 +222,19 @@ index 6fb5e17..a434a19 100644
|
||||
|
||||
// if the user has specified as base style in the theme settings,
|
||||
// prefer that
|
||||
@@ -147,6 +150,7 @@ MainWindow::MainWindow()
|
||||
@@ -156,6 +159,7 @@ MainWindow::MainWindow()
|
||||
}
|
||||
|
||||
QApplication::setStyle(new ManhattanStyle(baseName));
|
||||
+
|
||||
m_generalSettings->setShowShortcutsInContextMenu(
|
||||
m_generalSettings->showShortcutsInContextMenu());
|
||||
GeneralSettings::showShortcutsInContextMenu());
|
||||
|
||||
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
index c043b05..bcea8de 100644
|
||||
index a6b9466..17f37dc 100644
|
||||
--- a/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
@@ -208,16 +208,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option,
|
||||
@@ -218,16 +218,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option,
|
||||
case PM_DockWidgetHandleExtent:
|
||||
case PM_DockWidgetSeparatorExtent:
|
||||
return 1;
|
||||
@@ -264,7 +255,7 @@ index c043b05..bcea8de 100644
|
||||
case PM_ToolBarItemMargin:
|
||||
case PM_ToolBarItemSpacing:
|
||||
if (panelWidget(widget))
|
||||
@@ -783,6 +787,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
@@ -796,6 +800,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
}
|
||||
|
||||
switch (element) {
|
||||
@@ -272,7 +263,7 @@ index c043b05..bcea8de 100644
|
||||
case CE_MenuItem:
|
||||
painter->save();
|
||||
if (const auto mbi = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
|
||||
@@ -840,7 +845,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
@@ -853,7 +858,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
}
|
||||
painter->restore();
|
||||
break;
|
||||
@@ -281,7 +272,7 @@ index c043b05..bcea8de 100644
|
||||
case CE_ComboBoxLabel:
|
||||
if (const auto cb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
|
||||
if (panelWidget(widget)) {
|
||||
@@ -935,7 +940,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
@@ -948,7 +953,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
painter->restore();
|
||||
}
|
||||
break;
|
||||
@@ -290,7 +281,7 @@ index c043b05..bcea8de 100644
|
||||
case CE_MenuBarEmptyArea: {
|
||||
if (creatorTheme()->flag(Theme::FlatMenuBar))
|
||||
painter->fillRect(option->rect, StyleHelper::baseColor());
|
||||
@@ -949,7 +954,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
@@ -962,7 +967,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
|
||||
painter->restore();
|
||||
}
|
||||
break;
|
||||
@@ -300,29 +291,29 @@ index c043b05..bcea8de 100644
|
||||
{
|
||||
QRect rect = option->rect;
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From d5833872cc6290bbad5b15f5da82b87e30cd9cf3 Mon Sep 17 00:00:00 2001
|
||||
From ef780df82431157d4b7269f00921e8e288c31ac0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 May 2020 15:38:35 +1000
|
||||
Subject: Don't validate Qt toolkit
|
||||
|
||||
|
||||
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
|
||||
index 331e30f..b9a2b7f 100644
|
||||
index 61e9438..55304d5 100644
|
||||
--- a/src/plugins/qtsupport/baseqtversion.cpp
|
||||
+++ b/src/plugins/qtsupport/baseqtversion.cpp
|
||||
@@ -510,7 +510,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
|
||||
const QSet<Id> tdt = targetDeviceTypes();
|
||||
if (!tdt.isEmpty() && !tdt.contains(dt))
|
||||
result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version."));
|
||||
@@ -520,7 +520,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
|
||||
if (!tdt.isEmpty() && !tdt.contains(dt))
|
||||
result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version."));
|
||||
}
|
||||
-
|
||||
+#ifndef __HAIKU__
|
||||
if (ToolChain *tc = ToolChainKitAspect::cxxToolChain(k)) {
|
||||
Abi targetAbi = tc->targetAbi();
|
||||
bool fuzzyMatch = false;
|
||||
@@ -542,6 +542,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
|
||||
Abis supportedAbis = tc->supportedAbis();
|
||||
@@ -559,6 +559,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k)
|
||||
const QString message = tr("The kit has a Qt version, but no C++ compiler.");
|
||||
result << BuildSystemTask(Task::Warning, message);
|
||||
}
|
||||
@@ -331,20 +322,20 @@ index 331e30f..b9a2b7f 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From e8c40c1884c74afc6632df5fe2faeb0f657fe311 Mon Sep 17 00:00:00 2001
|
||||
From 9992e8e469dd6d3f78c7c5aedac0e054b9ab0a82 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 May 2020 17:26:06 +1000
|
||||
Subject: Make unknown host abi for Haiku
|
||||
|
||||
|
||||
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
|
||||
index b1d7574..13d3afd 100644
|
||||
index 62fd00b..1d9a942 100644
|
||||
--- a/src/plugins/projectexplorer/abi.cpp
|
||||
+++ b/src/plugins/projectexplorer/abi.cpp
|
||||
@@ -1127,6 +1127,10 @@ Abi Abi::hostAbi()
|
||||
@@ -1134,6 +1134,10 @@ Abi Abi::hostAbi()
|
||||
subos = WindowsMSysFlavor;
|
||||
#endif
|
||||
format = PEFormat;
|
||||
@@ -356,20 +347,59 @@ index b1d7574..13d3afd 100644
|
||||
os = LinuxOS;
|
||||
subos = GenericFlavor;
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 640c4fdd8097c9fa5c26e6a9c107950844cb5962 Mon Sep 17 00:00:00 2001
|
||||
From 21254881e0b604095c4b4152fb7ee82bcaa7f78d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 23 Oct 2020 09:14:22 +1000
|
||||
Subject: Use fsync
|
||||
Date: Tue, 29 Dec 2020 14:16:57 +1000
|
||||
Subject: Fix build for clang 9
|
||||
|
||||
|
||||
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
|
||||
index ff184ea..66399f7 100644
|
||||
--- a/src/plugins/clangformat/clangformatutils.cpp
|
||||
+++ b/src/plugins/clangformat/clangformatutils.cpp
|
||||
@@ -124,7 +124,7 @@ static clang::format::FormatStyle qtcStyle()
|
||||
#if LLVM_VERSION_MAJOR >= 12
|
||||
style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200, true}};
|
||||
#else
|
||||
- style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200}};
|
||||
+ style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200}};
|
||||
#endif
|
||||
style.IncludeStyle.IncludeIsMainRegex = "(Test)?$";
|
||||
style.IndentCaseLabels = false;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From f62281aaf92fd24f3d6b4061547e4aae1871efe7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 3 Jan 2022 11:41:36 +1000
|
||||
Subject: Fix build sqlite
|
||||
|
||||
|
||||
diff --git a/src/libs/3rdparty/sqlite/config.h b/src/libs/3rdparty/sqlite/config.h
|
||||
index 345e2b0..4fe631b 100644
|
||||
--- a/src/libs/3rdparty/sqlite/config.h
|
||||
+++ b/src/libs/3rdparty/sqlite/config.h
|
||||
@@ -35,6 +35,11 @@
|
||||
#define HAVE_UTIME 1
|
||||
#endif
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define _DEFAULT_SOURCE 1
|
||||
+#define _BSD_SOURCE 1
|
||||
+#endif
|
||||
+
|
||||
#if (_XOPEN_SOURCE >= 500) && !(_POSIX_C_SOURCE >= 200809L) || _DEFAULT_SOURCE || _BSD_SOURCE
|
||||
#define HAVE_USLEEP 1
|
||||
#endif
|
||||
diff --git a/src/libs/3rdparty/sqlite/sqlite3.c b/src/libs/3rdparty/sqlite/sqlite3.c
|
||||
index 55dc686..272ed4c 100644
|
||||
index 89faea5..030c772 100644
|
||||
--- a/src/libs/3rdparty/sqlite/sqlite3.c
|
||||
+++ b/src/libs/3rdparty/sqlite/sqlite3.c
|
||||
@@ -36917,7 +36917,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){
|
||||
@@ -37710,7 +37710,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){
|
||||
*/
|
||||
if( rc ) rc = fsync(fd);
|
||||
|
||||
@@ -378,8 +408,21 @@ index 55dc686..272ed4c 100644
|
||||
/* fdatasync() on HFS+ doesn't yet flush the file size if it changed correctly
|
||||
** so currently we default to the macro that redefines fdatasync to fsync
|
||||
*/
|
||||
diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.cpp b/src/libs/sqlite/createtablesqlstatementbuilder.cpp
|
||||
new file mode 100644
|
||||
index 0000000..e69de29
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 1edd4310b32ec325e85da95ce617d316555ae51e Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 3 Jan 2022 11:46:26 +1000
|
||||
Subject: Use fsync
|
||||
|
||||
|
||||
diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp
|
||||
index e96845e..9d6f471 100644
|
||||
index 721a872..e6cc8c1 100644
|
||||
--- a/src/libs/utils/savefile.cpp
|
||||
+++ b/src/libs/utils/savefile.cpp
|
||||
@@ -106,7 +106,7 @@ bool SaveFile::commit()
|
||||
@@ -392,28 +435,64 @@ index e96845e..9d6f471 100644
|
||||
#else
|
||||
fsync(handle());
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 89211d2f67db35032494604691193dbc8e67566a Mon Sep 17 00:00:00 2001
|
||||
From 7cdab8fe044610b85b6baa8397de5da73179e84a Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 29 Dec 2020 14:16:57 +1000
|
||||
Subject: Fix build for clang 9
|
||||
Date: Mon, 3 Jan 2022 11:48:00 +1000
|
||||
Subject: Use localtime for FileTime::toString
|
||||
|
||||
|
||||
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
|
||||
index 8e11c15..e0eb282 100644
|
||||
--- a/src/plugins/clangformat/clangformatutils.cpp
|
||||
+++ b/src/plugins/clangformat/clangformatutils.cpp
|
||||
@@ -115,7 +115,7 @@ static clang::format::FormatStyle qtcStyle()
|
||||
style.ExperimentalAutoDetectBinPacking = false;
|
||||
style.FixNamespaceComments = true;
|
||||
style.ForEachMacros = {"forever", "foreach", "Q_FOREACH", "BOOST_FOREACH"};
|
||||
- style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200}};
|
||||
+ style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200}};
|
||||
style.IncludeStyle.IncludeIsMainRegex = "(Test)?$";
|
||||
style.IndentCaseLabels = false;
|
||||
style.IndentWidth = 4;
|
||||
diff --git a/src/shared/qbs/src/lib/corelib/tools/filetime.cpp b/src/shared/qbs/src/lib/corelib/tools/filetime.cpp
|
||||
index 4ccb573..ee17422 100644
|
||||
--- a/src/shared/qbs/src/lib/corelib/tools/filetime.cpp
|
||||
+++ b/src/shared/qbs/src/lib/corelib/tools/filetime.cpp
|
||||
@@ -115,6 +115,13 @@ double FileTime::asDouble() const
|
||||
|
||||
QString FileTime::toString() const
|
||||
{
|
||||
+#ifdef __HAIKU__
|
||||
+ tm* stLocal = localtime(&m_fileTime);
|
||||
+ const QString result = QStringLiteral("%1.%2.%3 %4:%5:%6")
|
||||
+ .arg(stLocal->tm_mday, 2, 10, QLatin1Char('0')).arg(stLocal->tm_mon, 2, 10, QLatin1Char('0')).arg(stLocal->tm_year)
|
||||
+ .arg(stLocal->tm_hour, 2, 10, QLatin1Char('0')).arg(stLocal->tm_min, 2, 10, QLatin1Char('0')).arg(stLocal->tm_sec, 2, 10, QLatin1Char('0'));
|
||||
+ return result;
|
||||
+#else
|
||||
auto const ft = reinterpret_cast<const FILETIME *>(&m_fileTime);
|
||||
SYSTEMTIME stUTC, stLocal;
|
||||
FileTimeToSystemTime(ft, &stUTC);
|
||||
@@ -123,6 +130,7 @@ QString FileTime::toString() const
|
||||
.arg(stLocal.wDay, 2, 10, QLatin1Char('0')).arg(stLocal.wMonth, 2, 10, QLatin1Char('0')).arg(stLocal.wYear)
|
||||
.arg(stLocal.wHour, 2, 10, QLatin1Char('0')).arg(stLocal.wMinute, 2, 10, QLatin1Char('0')).arg(stLocal.wSecond, 2, 10, QLatin1Char('0'));
|
||||
return result;
|
||||
+#endif
|
||||
}
|
||||
|
||||
#else // defined(Q_OS_WIN)
|
||||
--
|
||||
2.28.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From 51da680eafbba495ba180fbe219605e79a8b9ba8 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 3 Jan 2022 11:48:53 +1000
|
||||
Subject: Disable dumpBacktrace for Haiku
|
||||
|
||||
|
||||
diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
|
||||
index 560df43..d1c2a29 100644
|
||||
--- a/src/libs/utils/qtcassert.cpp
|
||||
+++ b/src/libs/utils/qtcassert.cpp
|
||||
@@ -40,7 +40,7 @@ void dumpBacktrace(int maxdepth)
|
||||
{
|
||||
if (maxdepth == -1)
|
||||
maxdepth = 1000;
|
||||
-#if defined(Q_OS_UNIX)
|
||||
+#if defined(Q_OS_UNIX) && !defined(__HAIKU__)
|
||||
void *bt[1000] = {nullptr};
|
||||
int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
|
||||
char **lines = backtrace_symbols(bt, size);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -4,11 +4,11 @@ development environment (IDE) for application developers to create \
|
||||
applications for multiple desktop, embedded, and mobile device platforms, \
|
||||
such as Android and iOS."
|
||||
HOMEPAGE="https://www.qt.io/ide/"
|
||||
COPYRIGHT="2020 The Qt Company Ltd"
|
||||
COPYRIGHT="2021 The Qt Company Ltd"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e"
|
||||
CHECKSUM_SHA256="94ccca750150c731956ad368f69714ed5fd4c3b4cd35e5340df37920bded6f3b"
|
||||
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
|
||||
PATCHES="qt_creator-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="qt_creator.rdef.in"
|
||||
@@ -22,63 +22,71 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
cmd:qdoc$secondaryArchSuffix
|
||||
cmd:qmake$secondaryArchSuffix
|
||||
lib:libclang$secondaryArchSuffix
|
||||
lib:libclang_cpp$secondaryArchSuffix
|
||||
lib:libexecinfo$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libLLVM_9$secondaryArchSuffix
|
||||
lib:libQt5Concurrent$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Designer$secondaryArchSuffix
|
||||
lib:libQt5DesignerComponents$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Help$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
lib:libQt5Qml$secondaryArchSuffix
|
||||
lib:libQt5Quick$secondaryArchSuffix
|
||||
lib:libQt5QuickWidgets$secondaryArchSuffix
|
||||
lib:libQt5Script$secondaryArchSuffix
|
||||
lib:libQt5Sql$secondaryArchSuffix
|
||||
lib:libQt5Svg$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libQt5Xml$secondaryArchSuffix
|
||||
lib:libQt6Concurrent$secondaryArchSuffix
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Core5Compat$secondaryArchSuffix
|
||||
lib:libQt6Designer$secondaryArchSuffix
|
||||
lib:libQt6DesignerComponents$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Help$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6PrintSupport$secondaryArchSuffix
|
||||
lib:libQt6Qml$secondaryArchSuffix
|
||||
lib:libQt6Quick$secondaryArchSuffix
|
||||
lib:libQt6QuickWidgets$secondaryArchSuffix
|
||||
lib:libQt6Sql$secondaryArchSuffix
|
||||
lib:libQt6Svg$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:libQt6Xml$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
qt6_tools${secondaryArchSuffix}_devel
|
||||
devel:libclang$secondaryArchSuffix >= 9
|
||||
devel:libclang_cpp$secondaryArchSuffix >= 9
|
||||
devel:libexecinfo$secondaryArchSuffix
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libLLVM_9$secondaryArchSuffix
|
||||
devel:libQt5Concurrent$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5Designer$secondaryArchSuffix
|
||||
devel:libQt5DesignerComponents$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Help$secondaryArchSuffix
|
||||
devel:libQt5Network$secondaryArchSuffix
|
||||
devel:libQt5PrintSupport$secondaryArchSuffix
|
||||
devel:libQt5Qml$secondaryArchSuffix
|
||||
devel:libQt5Quick$secondaryArchSuffix
|
||||
devel:libQt5QuickWidgets$secondaryArchSuffix
|
||||
devel:libQt5Script$secondaryArchSuffix
|
||||
devel:libQt5Sql$secondaryArchSuffix
|
||||
devel:libQt5Svg$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:libQt5Xml$secondaryArchSuffix
|
||||
devel:libQt6Concurrent$secondaryArchSuffix
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Core5Compat$secondaryArchSuffix
|
||||
devel:libQt6Designer$secondaryArchSuffix
|
||||
devel:libQt6DesignerComponents$secondaryArchSuffix
|
||||
devel:libQt6Gui$secondaryArchSuffix
|
||||
devel:libQt6Help$secondaryArchSuffix
|
||||
devel:libQt6Network$secondaryArchSuffix
|
||||
devel:libQt6PrintSupport$secondaryArchSuffix
|
||||
devel:libQt6Qml$secondaryArchSuffix
|
||||
devel:libQt6Quick$secondaryArchSuffix
|
||||
devel:libQt6QuickWidgets$secondaryArchSuffix
|
||||
devel:libQt6Sql$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:libQt6Xml$secondaryArchSuffix
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:qdoc$secondaryArchSuffix
|
||||
cmd:qmake$secondaryArchSuffix
|
||||
cmd:qdoc6$secondaryArchSuffix
|
||||
cmd:qmake6$secondaryArchSuffix
|
||||
cmd:perl
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python2
|
||||
cmd:which
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
qmake -r
|
||||
qmake6
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -89,10 +97,11 @@ INSTALL()
|
||||
# Qt port doesn't support createPlatformOpenGLContext yet
|
||||
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so
|
||||
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so
|
||||
# Create symlink to libclang from Qt's build
|
||||
ln -s /system/apps/Qt5/lib/libclang* $appsDir/QtCreator/lib/qtcreator/
|
||||
# Create symlink to libclang
|
||||
ln -s /system/$relativeDevelopLibDir/libclang.so.9 $appsDir/QtCreator/lib/qtcreator/
|
||||
ln -s /system/$relativeDevelopLibDir/libclang.so.9 $appsDir/QtCreator/libexec/qtcreator/
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.qt5-qtcreator"
|
||||
local APP_SIGNATURE="application/x-vnd.qt6-qtcreator"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
Reference in New Issue
Block a user