qtcreator: move package from [libre-testing] to [libre]

3 files changed, 315 insertions, 0 deletions

diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
new file mode 100644
index 000000000..994c79e47
--- /dev/null
+++ b/libre/qtcreator/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 289773 2017-03-01 21:35:05Z svenstaro $
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor (Arch): Dan Vratil <progdan@progdansoft.com>
+# Contributor (Arch): thotypous <matiasΘarchlinux-br·org>
+# Contributor (Arch): delor <bartekpiech gmail com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=qtcreator
+pkgver=4.2.1
+_pkgver=v4.2.1
+pkgrel=3.parabola1
+pkgdesc='Lightweight, cross-platform integrated development environment, without nonfree qt5-webengine support'
+arch=('i686' 'x86_64')
+url='http://qt-project.org'
+license=('LGPL')
+depends=('qt5-tools' 'qt5-declarative' 'qt5-script' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'clang' 'qbs')
+makedepends=('git' 'mesa' 'llvm')
+options=('docs')
+optdepends=('qt5-doc: integrated Qt documentation'
+            'qt5-examples: welcome page examples'
+            'qt5-translations: for other languages'
+            'gdb: debugger'
+            'cmake: cmake project support'
+            'openssh-askpass: ssh support'
+            'git: git support'
+            'mercurial: mercurial support'
+            'bzr: bazaar support'
+            'valgrind: analyze support')
+source=("http://download.qt.io/official_releases/qtcreator/4.2/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz"
+        'libre.patch')
+sha512sums=('3135b64a36240bffe41c1373d5e5d5327cfa556f42eb339afcacf2f8d294843b96269269417ab262ba8292e28a57472c78ab7ff4686f0360616a4014c75809e9'
+            '57dd505e183661463567b6a7711a7b58f1d5e5b6ecc808acbae4df78366ed3d08be9eb04f6883ad8fd15318c826645e655e7028136b16a801e0084d3a2b51b2a')
+
+prepare() {
+  cd  $srcdir/qt-creator-opensource-src-$pkgver
+  patch -p1 -i ../libre.patch
+  rm -rv src/plugins/help/webenginehelpviewer.{cpp,h}
+}
+
+build() {
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
+
+  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
+  make
+  make docs -j1
+}
+
+package() {
+  cd build
+
+  make INSTALL_ROOT="${pkgdir}/usr/" install
+  make INSTALL_ROOT="${pkgdir}/usr/" install_docs
+
+  # Workaround for FS#40583
+  mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin
+  echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator
+  echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator
+  chmod +x "${pkgdir}"/usr/bin/qtcreator
+
+  install -Dm644 ${srcdir}/qt-creator-opensource-src-${pkgver}/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
+}
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch
new file mode 100644
index 000000000..ef434c9d9
--- /dev/null
+++ b/libre/qtcreator/libre.patch
@@ -0,0 +1,241 @@
+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
+@@ -7469,14 +7469,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
+@@ -8875,14 +8875,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
+@@ -34077,14 +34077,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/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
+index 23fad843d..4864a9c8d 100644
+--- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
++++ b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
+@@ -105,14 +105,6 @@
+       <description><![CDATA[Comparison of Qt Widgets and Qt Quick Controls.]]></description>
+       <tags>qt quick,widgets</tags>
+     </tutorial>
+-    <tutorial imageUrl="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="images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt WebEngine – Taming the Beast" isVideo="true" videoUrl="https://www.youtube.com/watch?v=3CTFxhBc_1I" videoLength="58:23">
+-      <description><![CDATA[Using the Qt WebEngine module.]]></description>
+-      <tags>qt webengine</tags>
+-    </tutorial>
+     <tutorial imageUrl="images/icons/worldsummit15.png" difficulty="" projectPath="" name="Building Desktop and Embedded UIs with Qt 3D" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QCdti6xmug0" videoLength="47:40">
+       <description><![CDATA[Adding 3D content to Qt applications.]]></description>
+       <tags>qt,qt creator,3d</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
++++ b/src/plugins/help/help.pro
+@@ -58,13 +58,6 @@ FORMS += docsettingspage.ui \
+     generalsettingspage.ui \
+     remotehelpfilter.ui
+ 
+-!isEmpty(QT.webenginewidgets.name) {
+-    QT += webenginewidgets
+-    HEADERS += webenginehelpviewer.h
+-    SOURCES += webenginehelpviewer.cpp
+-    DEFINES += QTC_WEBENGINE_HELPVIEWER
+-}
+-
+ 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>
+@@ -376,9 +373,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
++++ b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
+@@ -93,14 +93,6 @@ static inline QVector<const item*> itemVector()
+             QLatin1String("QtSvg"),
+             QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
+             false},
+-        {"webengine",
+-            QLatin1String("QtWebEngine"),
+-                    QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content using Chromium backend"),
+-                    false},
+-        {"webenginewidgets",
+-            QLatin1String("QtWebEngineWidgets"),
+-                    QCoreApplication::translate("QtModulesInfo", "WebEngine and QWidget-based classes using Chromium backend"),
+-                    false},
+         {"webkit",
+             QLatin1String("QtWebKit"),
+             QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
+diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+index df9a8110a..e2d2eaa37 100644
+--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
++++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+@@ -792,7 +792,6 @@ static bool isBlacklistImport(const ImportKey &importKey)
+             || importKey.libraryQualifiedPath() == QStringLiteral("Qt.WebSockets")
+             || importKey.libraryQualifiedPath() == QStringLiteral("QtWebkit")
+             || importKey.libraryQualifiedPath() == QStringLiteral("QtLocation")
+-            || importKey.libraryQualifiedPath() == QStringLiteral("QtWebEngine")
+             || importKey.libraryQualifiedPath() == QStringLiteral("QtWebChannel")
+             || importKey.libraryQualifiedPath() == QStringLiteral("QtWinExtras")
+             || importKey.libraryQualifiedPath() == QStringLiteral("QtPurchasing")
+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
+@@ -673,9 +673,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.481/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
+@@ -6862,7 +6862,6 @@
+ "searchtaskhandler.h"	"4"
+ "searchwidget.h"	"4"
+ "textbrowserhelpviewer.h"	"4"
+-"webenginehelpviewer.h"	"4"
+ "xbelsupport.h"	"4"
+ "Sources"	"3"
+ "centralwidget.cpp"	"4"
+@@ -6886,7 +6885,6 @@
+ "searchtaskhandler.cpp"	"4"
+ "searchwidget.cpp"	"4"
+ "textbrowserhelpviewer.cpp"	"4"
+-"webenginehelpviewer.cpp"	"4"
+ "xbelsupport.cpp"	"4"
+ "Forms"	"3"
+ "docsettingspage.ui"	"4"
diff --git a/libre/qtcreator/qtcreator.desktop b/libre/qtcreator/qtcreator.desktop
new file mode 100644
index 000000000..a8fbbb4d1
--- /dev/null
+++ b/libre/qtcreator/qtcreator.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Exec=qtcreator %F
+Name=Qt Creator
+GenericName=C++ IDE for developing Qt applications
+X-KDE-StartupNotify=true
+Icon=QtProject-qtcreator
+Terminal=false
+Categories=Development;IDE;Qt;
+MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;