Forwarding.
As I received the "confirm subscription" message after sending this,
I was effectively sending an email to a members-only mailing list while
not a member.
Please feel free to discard this if the original post gets moderator
approval.
Philip
-------- Original Message --------
Subject: Not-so-common build options causing problems for Qt5/git?
Date: Mon, 30 Jan 2012 07:12:21 +0000
From: Philip Ashmore <[email protected]>
To: [email protected]
Hi there.
I've been struggling to build Qt5 from git and I was wondering if I'm
alone in this respect.
I ran
$ ./configure -prefix /v3c/dev/Graphics/Qt/qt5/qtbase -no-wayland
-opengl -no-glib -opensource -confirm-license -qpa -v
I've attached a patch for QtWebkit.
See
http://developer.qt.nokia.com/forums/viewthread/7018/P30/
for more details about the changes and other observations.
Regards,
Philip Ashmore
diff --git a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
index 28316e0..e222ace 100644
--- a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
+++ b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
@@ -42,7 +42,8 @@ OpenGLFunctionTable* openGLFunctionTable()
#if PLATFORM(QT)
static void* getProcAddress(const char* procName)
{
- return QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName));
+ return (void *)QGLContext::currentContext()
+ ->getProcAddress(QString::fromLatin1(procName));
}
#else
typedef void* (*glGetProcAddressType) (const char* procName);
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
index 02b64a4..a53611e 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
@@ -26,6 +26,7 @@
#include "qwebpage.h"
#include <QNetworkAccessManager>
#include <QNetworkCookieJar>
+#include <QNetworkCookie>
namespace WebCore {
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
index 297bcec..71e8716 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
+++ b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
@@ -7,7 +7,7 @@ SOURCES += $${TARGET}.cpp \
../util.cpp
INCLUDEPATH += $$PWD
-QT += testlib declarative widgets
+QT += testlib declarative widgets quick
CONFIG += qtwebkit
diff --git a/Source/api.pri b/Source/api.pri
index d0d8021..ecf2fa2 100644
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -30,7 +30,7 @@ WEBKIT += webcore
QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
}
-QT += network
+QT += network quick
haveQt(5): QT += widgets printsupport
win32*:!win32-msvc* {
diff --git a/Source/tests.pri b/Source/tests.pri
index 1b415fd..769ac00 100644
--- a/Source/tests.pri
+++ b/Source/tests.pri
@@ -6,6 +6,7 @@
TEMPLATE = subdirs
CONFIG += ordered
+QT += quick
WEBKIT_TESTS_DIR = $$PWD/WebKit/qt/tests
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index 5aaaa68..32389f2 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -24,7 +24,7 @@ DESTDIR = $${ROOT_BUILD_DIR}/bin
CONFIG += qtwebkit qtwebkit-private
-QT += network declarative widgets
+QT += network declarative widgets quick
macx: QT += xml
RESOURCES += MiniBrowser.qrc
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index 2654365..9b7a896 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -155,8 +155,8 @@ bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
}
// Update current touch-point
- if (m_touchPoints.isEmpty())
- touchPoint.flags |= QTouchEvent::TouchPoint::Primary;
+ //if (m_touchPoints.isEmpty())
+ //; touchPoint.flags |= QTouchEvent::TouchPoint::Primary;
m_touchPoints.insert(touchPoint.id, touchPoint);
// Update states for all other touch-points
diff --git a/Tools/QtTestBrowser/cookiejar.cpp b/Tools/QtTestBrowser/cookiejar.cpp
index 22a8d17..18372dd 100644
--- a/Tools/QtTestBrowser/cookiejar.cpp
+++ b/Tools/QtTestBrowser/cookiejar.cpp
@@ -26,6 +26,7 @@
*/
#include "cookiejar.h"
+#include <QNetworkCookie>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QStandardPaths>
diff --git a/Tools/WebKitTestRunner/Target.pri b/Tools/WebKitTestRunner/Target.pri
index af180f2..a3e67ce 100644
--- a/Tools/WebKitTestRunner/Target.pri
+++ b/Tools/WebKitTestRunner/Target.pri
@@ -25,7 +25,7 @@ SOURCES += \
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT = core gui widgets network declarative testlib
+QT = core gui widgets network declarative testlib quick
load(features)
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
