[arch-commits] Commit in merkaartor/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Fri Jan 3 20:42:36 UTC 2020
Date: Friday, January 3, 2020 @ 20:42:36
Author: arojas
Revision: 547742
archrelease: copy trunk to community-x86_64
Added:
merkaartor/repos/community-x86_64/PKGBUILD
(from rev 547741, merkaartor/trunk/PKGBUILD)
merkaartor/repos/community-x86_64/merkaartor.appdata.xml
(from rev 547741, merkaartor/trunk/merkaartor.appdata.xml)
Deleted:
merkaartor/repos/community-x86_64/PKGBUILD
merkaartor/repos/community-x86_64/merkaartor-exiv2-0.27.1.patch
merkaartor/repos/community-x86_64/merkaartor.appdata.xml
merkaartor/repos/community-x86_64/nowebkit.patch
-------------------------------+
PKGBUILD | 77 +++-----
merkaartor-exiv2-0.27.1.patch | 12 -
merkaartor.appdata.xml | 86 ++++-----
nowebkit.patch | 356 ----------------------------------------
4 files changed, 76 insertions(+), 455 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-03 20:42:15 UTC (rev 547741)
+++ PKGBUILD 2020-01-03 20:42:36 UTC (rev 547742)
@@ -1,44 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Michael Kanis <mkanis gmx de>
-# Contributor: Paulo Freire <paulofreire gmail com>
-# Contributor: Brice Maron <brice bmaron net>
-
-pkgname=merkaartor
-pkgver=0.18.3
-pkgrel=9
-pkgdesc='OpenStreetMap editor'
-arch=('x86_64')
-url='http://merkaartor.be/'
-license=('GPL2')
-depends=('exiv2' 'gdal' 'gpsd' 'hicolor-icon-theme' 'qt5-svg')
-makedepends=('qt5-tools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"
- merkaartor.appdata.xml
- nowebkit.patch
- merkaartor-exiv2-0.27.1.patch)
-sha256sums=('d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947'
- '4082cae211a5480501abb95c302608c45363cc3152a70746a3f41f57c4252df6'
- 'f976a3bb6bcd0f0ef8723dcc8597f5ae9789c93143e7ef47f24f43c67913129b'
- '4627728ba02a35fc678c05e801e2499f069f4273af8dbb246040e5dc6f61d487')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../nowebkit.patch
- patch -p1 -i ../merkaartor-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1
- sed -i 's/GDAL_VERSION_MAJOR == 2/GDAL_VERSION_MAJOR == 3/' src/ImportExport/ImportExportGdal.h # Fix build with gdal 3.0.0
-}
-
-build() {
- cd $pkgname-$pkgver
- lrelease src/src.pro
- qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 USEWEBENGINE=0 \
- QMAKE_CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALL_ROOT="$pkgdir" install
- install -Dm644 ../merkaartor.appdata.xml "$pkgdir/usr/share/metainfo/merkaartor.appdata.xml"
-}
Copied: merkaartor/repos/community-x86_64/PKGBUILD (from rev 547741, merkaartor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-03 20:42:36 UTC (rev 547742)
@@ -0,0 +1,33 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Michael Kanis <mkanis gmx de>
+# Contributor: Paulo Freire <paulofreire gmail com>
+# Contributor: Brice Maron <brice bmaron net>
+
+pkgname=merkaartor
+pkgver=0.18.4
+pkgrel=1
+pkgdesc='OpenStreetMap editor'
+arch=('x86_64')
+url='http://merkaartor.be/'
+license=('GPL2')
+depends=('exiv2' 'gdal' 'gpsd' 'hicolor-icon-theme' 'qt5-svg')
+makedepends=('qt5-tools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"
+ merkaartor.appdata.xml)
+sha256sums=('16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a'
+ '9602378a7ee703653770a71062598e081d4d18d3cfb628e982a592f41b6fe33d')
+
+build() {
+ cd $pkgname-$pkgver
+ lrelease src/src.pro
+ qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 USEWEBENGINE=0 \
+ QMAKE_CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+ install -Dm644 ../merkaartor.appdata.xml "$pkgdir/usr/share/metainfo/merkaartor.appdata.xml"
+}
Deleted: merkaartor-exiv2-0.27.1.patch
===================================================================
--- merkaartor-exiv2-0.27.1.patch 2020-01-03 20:42:15 UTC (rev 547741)
+++ merkaartor-exiv2-0.27.1.patch 2020-01-03 20:42:36 UTC (rev 547742)
@@ -1,12 +0,0 @@
---- merkaartor-0.18.3/src/Docks/GeoImageDock.h.orig 2019-05-18 09:17:08.759836141 +0000
-+++ merkaartor-0.18.3/src/Docks/GeoImageDock.h 2019-05-18 09:17:23.353374620 +0000
-@@ -7,8 +7,7 @@
- #include <QDockWidget>
- #include <QMouseEvent>
- #include <QShortcut>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <QDrag>
-
- class ImageView;
Deleted: merkaartor.appdata.xml
===================================================================
--- merkaartor.appdata.xml 2020-01-03 20:42:15 UTC (rev 547741)
+++ merkaartor.appdata.xml 2020-01-03 20:42:36 UTC (rev 547742)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
- <id>org.merkaartor.merkaartor</id>
- <launchable type="desktop-id">merkaartor.desktop</launchable>
- <name>Merkaartor</name>
- <summary>OpenStreetMap editor</summary>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0</project_license>
- <description>
- <p>Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the whole world. Features:</p>
- <ul>
- <li>Download from and upload to the OpenStreetMap server</li>
- <li>Open .osm and .gpx files</li>
- <li>Create and move trackpoints, ways, and areas</li>
- <li>Add tags, delete features</li>
- <li>Reverse, split and join ways</li>
- <li>Visualize some leisure/landuse areas and road types</li>
- <li>Displaying GPS information</li>
- </ul>
- </description>
- <screenshots>
- <screenshot type="default">
- <caption>Merkaartor 0.15.3 with Mapnik style</caption>
- <image>https://wiki.openstreetmap.org/w/images/0/04/Merkaartor_0.15.3.png</image>
- </screenshot>
- <screenshot>
- <caption>Merkaartor 0.15.3 with Maxspeed style</caption>
- <image>https://wiki.openstreetmap.org/w/images/b/b4/Merkaartor_0.15.3_maxspeed.png</image>
- </screenshot>
- <screenshot>
- <caption>Merkaartor 0.15.3 showing the fully localized GUI</caption>
- <image>https://wiki.openstreetmap.org/w/images/4/48/Merkaartor_0.15.3_i18n.png</image>
- </screenshot>
- <screenshot>
- <caption>Merkaartor 0.15.3 with WMS background and semi-transparent map layer</caption>
- <image>https://wiki.openstreetmap.org/w/images/c/c9/Merkaartor_0.15.3_wms.png</image>
- </screenshot>
- </screenshots>
- <url type="bugtracker">https://github.com/openstreetmap/merkaartor/issues</url>
- <url type="homepage">http://merkaartor.be/</url>
- <update_contact>merkaartor at openstreetmap.org</update_contact>
- <translation type="qt">merkaartor</translation>
-</component>
Copied: merkaartor/repos/community-x86_64/merkaartor.appdata.xml (from rev 547741, merkaartor/trunk/merkaartor.appdata.xml)
===================================================================
--- merkaartor.appdata.xml (rev 0)
+++ merkaartor.appdata.xml 2020-01-03 20:42:36 UTC (rev 547742)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>org.merkaartor.merkaartor</id>
+ <launchable type="desktop-id">org.merkaartor.merkaartor.desktop</launchable>
+ <name>Merkaartor</name>
+ <summary>OpenStreetMap editor</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <description>
+ <p>Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the whole world. Features:</p>
+ <ul>
+ <li>Download from and upload to the OpenStreetMap server</li>
+ <li>Open .osm and .gpx files</li>
+ <li>Create and move trackpoints, ways, and areas</li>
+ <li>Add tags, delete features</li>
+ <li>Reverse, split and join ways</li>
+ <li>Visualize some leisure/landuse areas and road types</li>
+ <li>Displaying GPS information</li>
+ </ul>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <caption>Merkaartor 0.15.3 with Mapnik style</caption>
+ <image>https://wiki.openstreetmap.org/w/images/0/04/Merkaartor_0.15.3.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Merkaartor 0.15.3 with Maxspeed style</caption>
+ <image>https://wiki.openstreetmap.org/w/images/b/b4/Merkaartor_0.15.3_maxspeed.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Merkaartor 0.15.3 showing the fully localized GUI</caption>
+ <image>https://wiki.openstreetmap.org/w/images/4/48/Merkaartor_0.15.3_i18n.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Merkaartor 0.15.3 with WMS background and semi-transparent map layer</caption>
+ <image>https://wiki.openstreetmap.org/w/images/c/c9/Merkaartor_0.15.3_wms.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://github.com/openstreetmap/merkaartor/issues</url>
+ <url type="homepage">http://merkaartor.be/</url>
+ <update_contact>merkaartor at openstreetmap.org</update_contact>
+ <translation type="qt">merkaartor</translation>
+</component>
Deleted: nowebkit.patch
===================================================================
--- nowebkit.patch 2020-01-03 20:42:15 UTC (rev 547741)
+++ nowebkit.patch 2020-01-03 20:42:36 UTC (rev 547742)
@@ -1,356 +0,0 @@
-From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Mon, 26 Sep 2016 13:02:57 +0200
-Subject: [PATCH] Updated QWeb to QWebView.
-
----
- src/Layers/LicenseDisplayDialog.ui | 6 +++---
- src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
- src/QMapControl/browserimagemanager.h | 17 ++++++-----------
- src/src.pro | 2 +-
- 4 files changed, 19 insertions(+), 26 deletions(-)
-
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 103816c6..3dabd130 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -15,7 +15,7 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebView" name="webView">
-+ <widget class="QWebEngineView" name="webView">
- <property name="url">
- <url>
- <string>about:blank</string>
-@@ -41,9 +41,9 @@
- </widget>
- <customwidgets>
- <customwidget>
-- <class>QWebView</class>
-+ <class>QWebEngineView</class>
- <extends>QWidget</extends>
-- <header>QtWebKit/QWebView</header>
-+ <header>QWebEngineView</header>
- </customwidget>
- </customwidgets>
- <resources/>
-diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
-index 468cf2b6..4021d40f 100644
---- a/src/QMapControl/browserimagemanager.cpp
-+++ b/src/QMapControl/browserimagemanager.cpp
-@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
- //printf("%s\n", s);
- }
-
--void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-+void BrowserWebPage::javaScriptAlert ( const QString & msg )
- {
-- Q_UNUSED(frame)
- //QMessageBox::information(NULL, tr("Javascript alert"), msg);
-
- if (msg.startsWith("Coord")) {
-@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-
- void BrowserWebPage::launchRequest ( const QUrl & url )
- {
-+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
-+ "This code is not tested and may not work as expected. If you experience issues, please let us know.";
- sw = sh = 0;
-- mainFrame()->load(url);
-+ load(url);
- }
-
- BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
-@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
- }
-
- page = new BrowserWebPage();
-- page->setNetworkAccessManager(m_networkManager);
-- page->setViewportSize(QSize(1024, 1024));
-
- connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
-
-@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
-
- QUrl u = QUrl( R.url);
-
-- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
- page->launchRequest(u);
- requestActive = true;
- #ifndef BROWSERIMAGEMANAGER_IS_THREADED
-@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
- qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
- QPixmap pt(page->sw, page->sh);
- QPainter P(&pt);
-- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
-+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
- P.end();
-
- // if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
-@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
- void BrowserImageManager::abortLoading()
- {
- //qDebug() << "BrowserImageManager::abortLoading";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- if (!loadingRequests.isEmpty()) {
- LoadingRequest R = loadingRequests.dequeue();
- loadingRequests.clear();
-@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
- #ifdef BROWSERIMAGEMANAGER_IS_THREADED
- void BrowserImageManager::run()
- {
-- page = new BrowserWebPage();
-+ page = new BrowserWebEnginePage();
- page->setViewportSize(QSize(1024, 1024));
-
- QTimer theTimer;
-@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
- } else {
- if ((requestDuration++) > 100) {
- requestDuration = 0;
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- qDebug() << "BrowserImageManager Timeout";
- }
- }
-@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
- void BrowserImageManager::timeout()
- {
- qDebug() << "BrowserImageManager::timeout";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- pageLoadFinished(false);
- }
- #endif // BROWSERIMAGEMANAGER_IS_THREADED
-diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
-index 10f8a477..ca846e31 100644
---- a/src/QMapControl/browserimagemanager.h
-+++ b/src/QMapControl/browserimagemanager.h
-@@ -24,14 +24,10 @@
- #include <QPixmap>
-
- #include <QtNetwork/QtNetwork>
--#include <QWebFrame>
--#include "qwebhistory.h"
--#include "qwebhistoryinterface.h"
--#include "qwebkitglobal.h"
--#include "qwebpage.h"
--#include "qwebpluginfactory.h"
--#include "qwebsettings.h"
--#include "qwebview.h"
-+#include <QWebEnginePage>
-+#include <QWebEngineHistory>
-+#include <QWebEngineSettings>
-+#include <QWebEngineView>
-
- #include <QThread>
-
-@@ -41,13 +37,13 @@
- @author Chris Browet <cbro at semperpax.com>
- */
-
--class BrowserWebPage : public QWebPage
-+class BrowserWebPage : public QWebEnginePage
- {
- friend class BrowserImageManager;
-
- protected:
- virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
-- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
-+ virtual void javaScriptAlert ( const QString & msg ) ;
- void launchRequest ( const QUrl & url );
-
- private:
-@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
- static BrowserImageManager* m_BrowserImageManagerInstance;
-
- BrowserWebPage* page;
-- QWebFrame *frame;
- QNetworkAccessManager* qnam;
-
- signals:
-diff --git a/src/src.pro b/src/src.pro
-index eb93b263..137d7e14 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webkitwidgets concurrent printsupport
-+QT += svg network xml core gui webenginewidgets concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
-From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Mon, 26 Sep 2016 13:11:33 +0200
-Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
-
----
- ci/travis-linux-install.sh | 3 +--
- src/QMapControl.pri | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
-index 79975d27..4e83c9bb 100755
---- a/ci/travis-linux-install.sh
-+++ b/ci/travis-linux-install.sh
-@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
- sudo apt-get update -qq
- sudo apt-cache search qt
- sudo apt-get -qq install gdb libgdal-dev libproj-dev
--sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
--sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
-+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
- qtchooser -list-versions
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index bbfc09b5..92769565 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -26,7 +26,7 @@ QT += network
- DEFINES += USE_WEBKIT
- SOURCES += browserimagemanager.cpp
- HEADERS += browserimagemanager.h
-- QT += webkit
-+ QT += webenginewidgets
- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
- }
-From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
-Date: Wed, 28 Sep 2016 21:41:02 +0200
-Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
- conditional.
-
-This removes the QWebEngine dependency for most build configurations.
-None of the code actually uses it, but there are some plugins that do.
-I expect they are all obsolete, but will keep it in until they are
-replaced/deemed not working.
----
- COMPILE.md | 2 +-
- src/Layers/ImageMapLayer.cpp | 2 +-
- src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
- src/QMapControl.pri | 14 ++++++--------
- src/src.pro | 2 +-
- 5 files changed, 24 insertions(+), 25 deletions(-)
-
-diff --git a/COMPILE.md b/COMPILE.md
-index 9324019d..108a2eee 100644
---- a/COMPILE.md
-+++ b/COMPILE.md
-@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
- | TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed |
- | TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is |
- | NODEBUG=1 | release target |
--| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) |
-+| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) |
- | SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal |
-
-
-diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
-index 31966b09..b46199b9 100644
---- a/src/Layers/ImageMapLayer.cpp
-+++ b/src/Layers/ImageMapLayer.cpp
-@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
- QDialog dlg;
- ui.setupUi(&dlg);
- dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
-- ui.webView->load(u);
-+ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
-
- bool OK = false;
- while (!OK) {
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 3dabd130..dd748e41 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -6,8 +6,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>650</width>
-- <height>400</height>
-+ <width>786</width>
-+ <height>171</height>
- </rect>
- </property>
- <property name="windowTitle">
-@@ -15,11 +15,19 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebEngineView" name="webView">
-- <property name="url">
-- <url>
-- <string>about:blank</string>
-- </url>
-+ <widget class="QLabel" name="label">
-+ <property name="text">
-+ <string><html><head/><body><p>The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.</p></body></html></string>
-+ </property>
-+ <property name="wordWrap">
-+ <bool>true</bool>
-+ </property>
-+ </widget>
-+ </item>
-+ <item>
-+ <widget class="QLabel" name="urlLabel">
-+ <property name="text">
-+ <string>TextLabel</string>
- </property>
- </widget>
- </item>
-@@ -39,13 +47,6 @@
- </item>
- </layout>
- </widget>
-- <customwidgets>
-- <customwidget>
-- <class>QWebEngineView</class>
-- <extends>QWidget</extends>
-- <header>QWebEngineView</header>
-- </customwidget>
-- </customwidgets>
- <resources/>
- <connections>
- <connection>
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index 92769565..3491c8b1 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -21,13 +21,11 @@ SOURCES += \
-
- QT += network
-
--!contains(NOUSEWEBKIT,1) {
-- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
-- DEFINES += USE_WEBKIT
-- SOURCES += browserimagemanager.cpp
-- HEADERS += browserimagemanager.h
-- QT += webenginewidgets
-- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
-- }
-+contains(USEWEBENGINE,1) {
-+ DEFINES += USE_WEBKIT
-+ SOURCES += browserimagemanager.cpp
-+ HEADERS += browserimagemanager.h
-+ QT += webenginewidgets
-+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
-
-diff --git a/src/src.pro b/src/src.pro
-index 137d7e14..81a65f34 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webenginewidgets concurrent printsupport
-+QT += svg network xml core gui concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
More information about the arch-commits
mailing list