From nobody Wed May 18 19:50:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CB71E1ADE46A; Wed, 18 May 2022 19:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L3Nqs3nGKz3tKQ; Wed, 18 May 2022 19:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652903401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gue8oDE6BqL05mh5c5tveSk7jEEN3fluNqkXxanvVQc=; b=TLVGzyjEPb1N2AY8Te+aMw2Lh2XchEq7+5BSmKcYZuGb4MonVEgkHCEBwvvw5w89GwNWu7 Cyc/+szXzHNVL2E3CcckzuerkQ/qQf8oVUYZNiJUUOt55FDoo0Jap9IIiEHnVlMnGn5OGQ t1+4MyT/Qvmg8oABOFQbPg6gGiGqTGLtAxnqNCsbqpyNPgt5rFZvfZBZK2XjSxh7wg2RPd tcQOZkIsGLyO2XVirIaoU/Mc+eSVWDdHVqxAq9GxwnoVg9cLmmJe+yVm4+C1T5y6UoVgMi Hx0VtVhvnrIeDxUNmHihVKVjtEw8fdN2TXKLYZqGTuPB2OMivj2sE8kFn4BOlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00E5C76A6; Wed, 18 May 2022 19:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24IJo0n6045746; Wed, 18 May 2022 19:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24IJo0Ls045733; Wed, 18 May 2022 19:50:00 GMT (envelope-from git) Date: Wed, 18 May 2022 19:50:00 GMT Message-Id: <202205181950.24IJo0Ls045733@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 0264cd941160 - main - devel/qtcreator: prepare for KF5-5.94 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0264cd941160ab8b21e72a2389f83551dd368321 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652903401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gue8oDE6BqL05mh5c5tveSk7jEEN3fluNqkXxanvVQc=; b=xQ1Zp4nDaLpPl0cdtayJpB+yBV+PqCUGfSN3RgAQRnRA54bN4h+Mh6YEIILoVnO1GavNaM hXUFeZ14aPA6++OLLcJETTDQ4ldLv/BDvSpOB2yM5G5mNXz0UKVy6etwSgP2ggS/sgLth4 /bQwyFm8eVjGyuMwXqWREdS1/Le8WeEBwOhm+QgpWXNWjaAn9WKVLRPbL8RJoY9zgIbslO xy30+A2Jm9aAHBpQu5yhRgI5IU3bSXw4JvQa5+USvrHjcNr8wqPLJnKmnI1mA3+RtbfFw9 /LOmZ/m8Cv7OuMT9CTv1zU19mWt7sDNUL0khY/Cp1UWRCOn3XQ4Dl/tjvTyhgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652903401; a=rsa-sha256; cv=none; b=BGhvFwBarbPjAQp+vV5nPTYG3Ght3kxudCw/DESbfrxPvy85NfUK8MEw54CCdPPv0CvGXB SzqXDVJYD+IQlqvABTuUhagRQBSUNgRRrb7X4sw1+YNAOrQUJECR4r9Yo2MYIYM+fPdQCd 4JZZJRWdVLCCPxEf+4t6oUSJxw2PBA+ja9tfrJUyXdf6qL8h+xGPr7GwvbsTFx07IZw3GZ pyd375VJQxmGolkRetQZEHfp/M1m94V6XJwar1ZGw58NvrkZsfDTVCaoFGIXrbEVx7tGU0 iC5jGDfuOU1jNM0DSEmxEqCldrPbvYIj7J/AX+F2JLW0BTNQG6gy+A/tTvr6QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0264cd941160ab8b21e72a2389f83551dd368321 commit 0264cd941160ab8b21e72a2389f83551dd368321 Author: Tobias C. Berner AuthorDate: 2022-05-18 19:29:19 +0000 Commit: Tobias C. Berner CommitDate: 2022-05-18 19:49:51 +0000 devel/qtcreator: prepare for KF5-5.94 PR: 263968 --- devel/qtcreator/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index fef12593c7b5..4b2dc2480747 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -30,6 +30,10 @@ USE_QT= buildtools concurrent core declarative designer gui help \ quick3d quickcontrols script serialport sql svg testlib \ webchannel widgets xml xmlpatterns +# Workaround, KF5-5.94 moved header files to subfolder. Instead of using the bundled +# syntax-highligher, just help it find the proper files. +CFLAGS+= -I${LOCALBASE}/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting + SHEBANG_FILES= tests/system/tools/objectsToTable.py \ tests/system/tools/findUnusedObjects.py \ share/qtcreator/templates/wizards/files/python/file.py \