mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
58 lines
1.5 KiB
Plaintext
58 lines
1.5 KiB
Plaintext
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
|
|
|