Last active
August 29, 2015 13:56
-
-
Save azbesthu/8848765 to your computer and use it in GitHub Desktop.
pending - commiting
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/process/process.pro b/src/process/process.pro | |
index 8e9c37f..795cc1a 100644 | |
--- a/src/process/process.pro | |
+++ b/src/process/process.pro | |
@@ -1,11 +1,13 @@ | |
TARGET = $$QTWEBENGINEPROCESS_NAME | |
TEMPLATE = app | |
-macx { | |
+macx|win32 { | |
LIBPATH = $$getOutDir()/$$getConfigDir() | |
CONFIG -= app_bundle | |
} else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
-LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
+ | |
+win32:LIBS_PRIVATE += -lQt5WebEngineCore.dll -L$$LIBPATH | |
+else:LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
QMAKE_RPATHDIR += $$LIBPATH | |
qnx: QMAKE_RPATHLINKDIR += $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib/qt5/lib | |
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp | |
index 049e353..f5168f0 100644 | |
--- a/src/webengine/api/qquickwebengineview.cpp | |
+++ b/src/webengine/api/qquickwebengineview.cpp | |
@@ -444,11 +444,12 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect | |
QQuickItem::geometryChanged(newGeometry, oldGeometry); | |
Q_FOREACH(QQuickItem *child, childItems()) { | |
- Q_ASSERT( | |
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) | |
- qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child) || | |
+ Q_ASSERT(qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child) || | |
+ qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child)); | |
+#else | |
+ Q_ASSERT(qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child)); | |
#endif | |
- qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child)); | |
child->setSize(newGeometry.size()); | |
} | |
} | |
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | |
index 37ac9ed..3dfc930 100644 | |
--- a/src/webengine/api/qquickwebengineview_p_p.h | |
+++ b/src/webengine/api/qquickwebengineview_p_p.h | |
@@ -51,8 +51,13 @@ | |
#include <QtCore/qcompilerdetection.h> | |
#include <QtQuick/private/qquickitem_p.h> | |
+#if defined(Q_OS_WIN) | |
+#include "web_contents_adapter.h" | |
+#include "ui_delegates_manager.h" | |
+#else | |
class WebContentsAdapter; | |
class UIDelegatesManager; | |
+#endif | |
QT_BEGIN_NAMESPACE | |
class QQuickWebEngineView; | |
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro | |
index fb396c3..50b36e0 100644 | |
--- a/src/webengine/plugin/experimental/experimental.pro | |
+++ b/src/webengine/plugin/experimental/experimental.pro | |
@@ -8,7 +8,7 @@ QT_PRIVATE += webengine-private qml-private quick-private gui-private core-priva | |
qtHaveModule(v8): QT_PRIVATE += v8-private | |
-INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine/api | |
+INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api | |
SOURCES = plugin.cpp | |
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro | |
index 9dca82f..0c44daa 100644 | |
--- a/src/webengine/plugin/plugin.pro | |
+++ b/src/webengine/plugin/plugin.pro | |
@@ -6,7 +6,7 @@ IMPORT_VERSION = 1.0 | |
QT += webengine qml quick | |
QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private | |
-INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine/api | |
+INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api | |
SOURCES = plugin.cpp | |
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp | |
index 13e4a9f..d526f06 100644 | |
--- a/src/webengine/ui_delegates_manager.cpp | |
+++ b/src/webengine/ui_delegates_manager.cpp | |
@@ -60,7 +60,7 @@ | |
#define NO_SEPARATOR | |
#define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ | |
case UIDelegatesManager::TYPE:\ | |
- return QStringLiteral(#TYPE".qml"); | |
+ return QStringLiteral(#TYPE) % QStringLiteral(".qml"); | |
static QString fileNameForComponent(UIDelegatesManager::ComponentType type) | |
{ | |
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro | |
index 877c515..8052f05 100644 | |
--- a/src/webengine/webengine.pro | |
+++ b/src/webengine/webengine.pro | |
@@ -1,20 +1,27 @@ | |
+# Use Qt5 module system | |
+load(qt_build_config) | |
+ | |
+TEMPLATE = lib | |
TARGET = QtWebEngine | |
+MODULE = webengine | |
+ | |
# For our export macros | |
DEFINES += QT_BUILD_WEBENGINE_LIB | |
- | |
QT += qml quick | |
QT_PRIVATE += qml-private quick-private gui-private core-private | |
# Remove this as soon as we have a hard-dependency on Qt 5.2 | |
qtHaveModule(v8): QT_PRIVATE += v8-private | |
-INCLUDEPATH += api ../core | |
+INCLUDEPATH += $$PWD api ../core | |
# FIXME: all this should eventually be turned into QT += webenginecore | |
-macx:LIBPATH = $$getOutDir()/$$getConfigDir() | |
+macx|win32:LIBPATH = $$getOutDir()/$$getConfigDir() | |
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
-LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
+ | |
+win32:LIBS_PRIVATE += -lQt5WebEngineCore.dll -L$$LIBPATH | |
+else:LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
QMAKE_RPATHDIR += $$LIBPATH | |
#DESTDIR = $$LIBPATH | |
diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp | |
index 2dd69dc..bb03fed 100644 | |
--- a/src/webenginewidgets/api/qwebenginehistory.cpp | |
+++ b/src/webenginewidgets/api/qwebenginehistory.cpp | |
@@ -93,13 +93,13 @@ QString QWebEngineHistoryItem::title() const | |
QDateTime QWebEngineHistoryItem::lastVisited() const | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
return QDateTime(); | |
} | |
QIcon QWebEngineHistoryItem::icon() const | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
return QIcon(); | |
} | |
@@ -108,9 +108,9 @@ QVariant QWebEngineHistoryItem::userData() const | |
return QVariant(); | |
} | |
-void QWebEngineHistoryItem::setUserData(const QVariant& userData) | |
+void QWebEngineHistoryItem::setUserData(const QVariant&) | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
} | |
bool QWebEngineHistoryItem::isValid() const | |
@@ -268,20 +268,20 @@ int QWebEngineHistory::maximumItemCount() const | |
return 100; | |
} | |
-void QWebEngineHistory::setMaximumItemCount(int count) | |
+void QWebEngineHistory::setMaximumItemCount(int) | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
} | |
-QDataStream& operator<<(QDataStream& stream, const QWebEngineHistory& history) | |
+QDataStream& operator<<(QDataStream& stream, const QWebEngineHistory&) | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
return stream; | |
} | |
-QDataStream& operator>>(QDataStream& stream, QWebEngineHistory& history) | |
+QDataStream& operator>>(QDataStream& stream, QWebEngineHistory&) | |
{ | |
- qWarning("Not implemented: %s", __func__); | |
+ qWarning("Not implemented: %s", __FUNCTION__); | |
return stream; | |
} | |
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h | |
index c501111..93a38c9 100644 | |
--- a/src/webenginewidgets/api/qwebenginepage.h | |
+++ b/src/webenginewidgets/api/qwebenginepage.h | |
@@ -29,6 +29,7 @@ | |
#include <QtCore/qurl.h> | |
#include <QtCore/qvariant.h> | |
#include <QtNetwork/qnetworkaccessmanager.h> | |
+#include <QtNetwork/qnetworkrequest.h> | |
#include <QtWidgets/qwidget.h> | |
QT_BEGIN_NAMESPACE | |
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro | |
index a78efaa..8d4f762 100644 | |
--- a/src/webenginewidgets/webenginewidgets.pro | |
+++ b/src/webenginewidgets/webenginewidgets.pro | |
@@ -9,18 +9,20 @@ MODULE = webenginewidgets | |
# For our export macros | |
DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB | |
-QT += widgets | |
+QT += widgets network | |
QT_PRIVATE += widgets-private gui-private core-private | |
# FIXME: all this should eventually be turned into QT += webenginecore | |
-macx:LIBPATH = $$getOutDir()/$$getConfigDir() | |
+macx|win32:LIBPATH = $$getOutDir()/$$getConfigDir() | |
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib | |
-LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
+ | |
+win32: LIBS_PRIVATE += -lQt5WebEngineCore.dll -L$$LIBPATH | |
+else: LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH | |
QMAKE_RPATHDIR += $$LIBPATH | |
DESTDIR = $$LIBPATH | |
-INCLUDEPATH += api ../core | |
+INCLUDEPATH += $$PWD api ../core | |
SOURCES = \ | |
api/qwebenginehistory.cpp \ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment