summaryrefslogtreecommitdiff
path: root/libre/qtcreator
diff options
context:
space:
mode:
Diffstat (limited to 'libre/qtcreator')
-rw-r--r--libre/qtcreator/PKGBUILD20
-rw-r--r--libre/qtcreator/libre.patch192
2 files changed, 13 insertions, 199 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
index d5b1dcfc2..4293cb629 100644
--- a/libre/qtcreator/PKGBUILD
+++ b/libre/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# Maintainer: bill-auger <bill-auger@programmer.net>
# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -12,17 +12,19 @@
# - removed support for qt5-webengine
# - added patch to build on arm
+
pkgname=qtcreator
-pkgver=4.5.2
-_clangver=5.0.1
+pkgver=4.6.2
+_clangver=6.0.0
pkgrel=1
-pkgrel+=.parabola2
+pkgrel+=.parabola1
pkgdesc='Lightweight, cross-platform integrated development environment'
pkgdesc+=', without nonfree qt5-webengine support'
arch=(x86_64)
arch+=(i686 armv7h)
url='http://qt-project.org'
license=(LGPL)
+
depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs)
makedepends=(git mesa llvm)
options=(docs)
@@ -36,17 +38,21 @@ optdepends=('qt5-doc: integrated Qt documentation'
'mercurial: mercurial support'
'bzr: bazaar support'
'valgrind: analyze support')
+
source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz")
-source+=('0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch' 'libre.patch')
-sha256sums=('32fe9ffbb170d0461f6b010dcb0db4dd73c3b27cc575c760958507929975693a'
+source+=('0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch'
+ 'libre.patch')
+sha256sums=('bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc'
'56e6876f41ee8909ee197f7ab5a2bb18ad5a7fe26ce490a48cdf062fa199ffc6'
- '14c2ded79d5e263f78a748afb5688b946ae243f3e7e4b765c198681c371d467c')
+ '53d119a70047c6b64d8227e65d402d308017cc1d99d8886421bf2da4f7407c80')
+
prepare() {
mkdir -p build
# fix hardcoded libexec path
sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator-opensource-src-${pkgver}/qtcreator.pri
+
# use system qbs
rm -r qt-creator-opensource-src-${pkgver}/src/shared/qbs
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch
index 3fc595350..f567dd62e 100644
--- a/libre/qtcreator/libre.patch
+++ b/libre/qtcreator/libre.patch
@@ -1,98 +1,3 @@
-diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
-index 63d7263b7..b0f6223de 100644
---- a/share/qtcreator/translations/qtcreator_de.ts
-+++ b/share/qtcreator/translations/qtcreator_de.ts
-@@ -8120,14 +8120,6 @@ Rename %2 to %3 anyway?</source>
- <translation>Klassen zur Anzeige des Inhalts von SVG-Dateien</translation>
- </message>
- <message>
-- <source>Classes for displaying and editing Web content using Chromium backend</source>
-- <translation>Klassen zum Anzeigen und Bearbeiten von Web-Inhalten mithilfe des Chromium-Backends</translation>
-- </message>
-- <message>
-- <source>WebEngine and QWidget-based classes using Chromium backend</source>
-- <translation>Auf WebEngine und QWidget basierende Klassen, die das Chromium-Backend verwenden</translation>
-- </message>
-- <message>
- <source>Classes for displaying and editing Web content</source>
- <translation>Klassen zum Anzeigen und Bearbeiten von Web-Inhalten</translation>
- </message>
-diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
-index 8d66d620d..189e68006 100644
---- a/share/qtcreator/translations/qtcreator_ja.ts
-+++ b/share/qtcreator/translations/qtcreator_ja.ts
-@@ -24224,14 +24224,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
- <translation>SVG ファイルを表示する為のクラスです</translation>
- </message>
- <message>
-- <source>Classes for displaying and editing Web content using Chromium backend</source>
-- <translation>Chromium バックエンドを使用する Web コンテンツを表示・編集する為のクラスです</translation>
-- </message>
-- <message>
-- <source>WebEngine and QWidget-based classes using Chromium backend</source>
-- <translation>Chromium バックエンドを使用する WebEngine と QWidget ベースのクラスです</translation>
-- </message>
-- <message>
- <source>Classes for displaying and editing Web content</source>
- <translation>Web コンテンツを表示・編集する為のクラスです</translation>
- </message>
-diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
-index 07f8e0ba8..f05abba0f 100644
---- a/share/qtcreator/translations/qtcreator_pl.ts
-+++ b/share/qtcreator/translations/qtcreator_pl.ts
-@@ -8946,14 +8946,6 @@ do projektu &quot;%2&quot;.</translation>
- <translation>Klasy służące do wyświetlania zawartości plików SVG</translation>
- </message>
- <message>
-- <source>Classes for displaying and editing Web content using Chromium backend</source>
-- <translation>Klasy służące do wyświetlania i modyfikacji zawartości stron internetowych, używające back-endu Chromium</translation>
-- </message>
-- <message>
-- <source>WebEngine and QWidget-based classes using Chromium backend</source>
-- <translation>Klasy WebEngine i klasy bazujące na QWidget, używające back-endu Chromium</translation>
-- </message>
-- <message>
- <source>Classes for displaying and editing Web content</source>
- <translation>Klasy służące do wyświetlania i modyfikacji zawartości stron internetowych</translation>
- </message>
-diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
-index 7ada6cbbc..ba74b030b 100644
---- a/share/qtcreator/translations/qtcreator_ru.ts
-+++ b/share/qtcreator/translations/qtcreator_ru.ts
-@@ -35630,14 +35630,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf
- <translation>Классы для отображения содержимого файлов SVG</translation>
- </message>
- <message>
-- <source>Classes for displaying and editing Web content using Chromium backend</source>
-- <translation>Классы для отображения и изменения Web-содержимого с использованием движка Chromium</translation>
-- </message>
-- <message>
-- <source>WebEngine and QWidget-based classes using Chromium backend</source>
-- <translation>WebEngine и классы на базе QWidget, использующие движок Chromium</translation>
-- </message>
-- <message>
- <source>Classes for displaying and editing Web content</source>
- <translation>Классы для отображения и правки вэб-страниц</translation>
- </message>
-diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml
-index 23fad843d..4864a9c8d 100644
---- a/src/plugins/qtsupport/qtcreator_tutorials.xml
-+++ b/src/plugins/qtsupport/qtcreator_tutorials.xml
-@@ -124,14 +124,6 @@
- <description><![CDATA[Using Qt with macOS native windows.]]></description>
- <tags>macos</tags>
- </tutorial>
-- <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt's Web Offering - An Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=XW-oTBCj1JQ" videoLength="23:32">
-- <description><![CDATA[Overview of the Qt modules that provide functions for embedding web content into applications.]]></description>
-- <tags>qt webengine</tags>
-- </tutorial>
-- <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="New Possibilities with Qt WebEngine" isVideo="true" videoUrl="https://youtu.be/E7CIIHT_jCk" videoLength="22:29">
-- <description><![CDATA[Using the Qt WebEngine module.]]></description>
-- <tags>qt webengine</tags>
-- </tutorial>
- <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Developing for Multiple Screen Resolutions and Platforms" isVideo="true" videoUrl="https://youtu.be/qclquZ99ZVQ" videoLength="27:44">
- <description><![CDATA[Best practices for an efficient app lifecycle.]]></description>
- <tags>qt,qt quick,screen resolution</tags>
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index ffe71b6f1..a8d0bd72f 100644
--- a/src/plugins/help/help.pro
@@ -111,30 +16,6 @@ index ffe71b6f1..a8d0bd72f 100644
osx {
DEFINES += QTC_MAC_NATIVE_HELPVIEWER
QT += macextras
-diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
-index 115bdfbca..8bde52c9f 100644
---- a/src/plugins/help/helpplugin.cpp
-+++ b/src/plugins/help/helpplugin.cpp
-@@ -46,9 +46,6 @@
- #ifdef QTC_MAC_NATIVE_HELPVIEWER
- #include "macwebkithelpviewer.h"
- #endif
--#ifdef QTC_WEBENGINE_HELPVIEWER
--#include "webenginehelpviewer.h"
--#endif
-
- #include <bookmarkmanager.h>
- #include <contentwindow.h>
-@@ -369,9 +366,6 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
- typedef std::function<HelpViewer *()> ViewerFactory;
- typedef QPair<QByteArray, ViewerFactory> ViewerFactoryItem; // id -> factory
- QVector<ViewerFactoryItem> factories;
--#ifdef QTC_WEBENGINE_HELPVIEWER
-- factories.append(qMakePair(QByteArray("qtwebengine"), []() { return new WebEngineHelpViewer(); }));
--#endif
- factories.append(qMakePair(QByteArray("textbrowser"), []() { return new TextBrowserHelpViewer(); }));
-
- #ifdef QTC_MAC_NATIVE_HELPVIEWER
diff --git a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
index a10899a2a..9ce2b463d 100644
--- a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
@@ -154,76 +35,3 @@ index a10899a2a..9ce2b463d 100644
{"webkit",
QLatin1String("QtWebKit"),
QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
-diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
-index db4c4e1cd..6703f190c 100644
---- a/tests/system/shared/utils.py
-+++ b/tests/system/shared/utils.py
-@@ -688,9 +688,6 @@ def getHelpViewer():
- except:
- pass
- try:
-- return waitForObject("{type='QWebEngineView' unnamed='1' "
-- "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 1000)
-- except:
- return waitForObject("{type='Help::Internal::TextBrowserHelpWidget' unnamed='1' "
- "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 1000)
-
-diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py
-index 7f046e76a..90412afa6 100755
---- a/tests/system/suite_HELP/tst_HELP04/test.py
-+++ b/tests/system/suite_HELP/tst_HELP04/test.py
-@@ -32,22 +32,6 @@ urlDictionary = { "deployment":"qthelp://com.trolltech.qt.481/qdoc/gettingstarte
- "build":"qthelp://com.trolltech.qt.487/qdoc/sql-driver.html" }
-
-
--def __getSelectedText__():
-- hv = getHelpViewer()
-- isWebEngineView = className(hv) == "QWebEngineView"
-- try:
-- selText = hv.selectedText
-- if className(selText) != 'instancemethod':
-- return str(selText), isWebEngineView
-- except:
-- pass
-- try:
-- selText = getHighlightsInHtml(str(hv.toHtml()))
-- except:
-- test.warning("Could not get highlighted text.")
-- selText = ''
-- return str(selText), isWebEngineView
--
- def __getUrl__():
- helpViewer = getHelpViewer()
- try:
-@@ -69,11 +53,6 @@ def getHighlightsInHtml(htmlCode):
- return res
-
- def verifySelection(expected):
-- selText, isWebEngineView = __getSelectedText__()
-- if isWebEngineView:
-- test.log("The search results are not a selection in a QWebEngineView",
-- "Searched strings should still be highlighted")
-- return
- selText = str(selText)
- if test.verify(selText, "Verify that there is a selection"):
- # verify if search keyword is found in results
-diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
-index d3a824e96..8a98b8b6e 100644
---- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
-+++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv
-@@ -7306,7 +7306,6 @@
- "searchtaskhandler.h" "4"
- "searchwidget.h" "4"
- "textbrowserhelpviewer.h" "4"
--"webenginehelpviewer.h" "4"
- "xbelsupport.h" "4"
- "Sources" "3"
- "centralwidget.cpp" "4"
-@@ -7328,7 +7327,6 @@
- "searchtaskhandler.cpp" "4"
- "searchwidget.cpp" "4"
- "textbrowserhelpviewer.cpp" "4"
--"webenginehelpviewer.cpp" "4"
- "xbelsupport.cpp" "4"
- "Forms" "3"
- "docsettingspage.ui" "4"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 16:30:17 +0000