mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
googlemaps_mini: use Qt5
This commit is contained in:
@@ -1,13 +1,17 @@
|
||||
SUMMARY="Google Maps Mini"
|
||||
DESCRIPTION="
|
||||
Qt Widget that allows a user to choose lat/lng from a GoogleMap view, with location search"
|
||||
HOMEPAGE="http://www.haikuware.com/directory/view-details/internet-network/web-browsers/googlemaps-mini"
|
||||
DESCRIPTION="Qt Widget that allows a user to choose lat/lng from a GoogleMap \
|
||||
view, with location search"
|
||||
HOMEPAGE="https://github.com/mgermain-genymobile/GoogleMapQtWidget/"
|
||||
COPYRIGHT="2013 Morgan Germain"
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="git+https://github.com/mgermain-genymobile/GoogleMapQtWidget.git#3fefbef368430deda7bd26e2a875cca3db2126ce"
|
||||
REVISION="2"
|
||||
COMMIT="3fefbef368430deda7bd26e2a875cca3db2126ce"
|
||||
SOURCE_URI="https://github.com/mgermain-genymobile/GoogleMapQtWidget/archive/$COMMIT.tar.gz"
|
||||
SOURCE_DIR="GoogleMapQtWidget-$COMMIT"
|
||||
CHECKSUM_SHA256="db4cf6b5c725ade4e8177af9288e7173c43a9e37b4429e0d06dd15f72c06fedf"
|
||||
PATCHES="googlemaps_mini-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
@@ -15,18 +19,32 @@ PROVIDES="
|
||||
app:googlemaps_mini = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku${secondaryArchSuffix}
|
||||
libqt4${secondaryArchSuffix} < 5
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5Script$secondaryArchSuffix
|
||||
lib:libQt5WebKit$secondaryArchSuffix
|
||||
lib:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
libqt4${secondaryArchSuffix}_devel < 5
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Network$secondaryArchSuffix
|
||||
devel:libQt5Script$secondaryArchSuffix
|
||||
devel:libQt5WebKit$secondaryArchSuffix
|
||||
devel:libQt5WebKitWidgets$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:make
|
||||
cmd:gcc${secondaryArchSuffix}
|
||||
cmd:qmake${secondaryArchSuffix}
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:qmake$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From e1f5353e0acdd18a20a839982153334b794a874a Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Tue, 14 Nov 2017 08:49:02 +0300
|
||||
Subject: Fix build on Qt5
|
||||
|
||||
|
||||
diff --git a/GoogleMapQtWidget.pro b/GoogleMapQtWidget.pro
|
||||
index 960af2c..6c12de1 100644
|
||||
--- a/GoogleMapQtWidget.pro
|
||||
+++ b/GoogleMapQtWidget.pro
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
-QT += core gui webkit network script
|
||||
+QT += core gui webkit network script widgets webkitwidgets
|
||||
#QT += debug
|
||||
|
||||
TARGET = mgeGoogleMap
|
||||
diff --git a/mainwindow.cpp b/mainwindow.cpp
|
||||
index 9e0f99c..180cde0 100644
|
||||
--- a/mainwindow.cpp
|
||||
+++ b/mainwindow.cpp
|
||||
@@ -1,13 +1,9 @@
|
||||
#include "mainwindow.h"
|
||||
#include <QtCore/QDebug>
|
||||
-#include <QtGui/QGridLayout>
|
||||
-#include <QtGui/QMessageBox>
|
||||
#include <QtScript/QScriptValue>
|
||||
#include <QtScript/QScriptEngine>
|
||||
#include <QtNetwork/QNetworkRequest>
|
||||
#include <QtNetwork/QNetworkReply>
|
||||
-#include <QtWebKit/QWebFrame>
|
||||
-#include <QtWebKit/QWebElement>
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent)
|
||||
: QMainWindow(parent)
|
||||
diff --git a/mainwindow.h b/mainwindow.h
|
||||
index be68f7d..ab03fe1 100644
|
||||
--- a/mainwindow.h
|
||||
+++ b/mainwindow.h
|
||||
@@ -1,10 +1,8 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
-#include <QtGui/QMainWindow>
|
||||
-#include <QtGui/QLineEdit>
|
||||
-#include <QtGui/QPushButton>
|
||||
-#include <QtWebKit/QWebView>
|
||||
+#include <QtWidgets>
|
||||
+#include <QtWebKitWidgets>
|
||||
#include <QtNetwork/QNetworkAccessManager>
|
||||
|
||||
class JsObject : public QObject
|
||||
--
|
||||
2.14.2
|
||||
|
||||
Reference in New Issue
Block a user