Title: [91766] trunk
- Revision
- 91766
- Author
- [email protected]
- Date
- 2011-07-26 11:09:55 -0700 (Tue, 26 Jul 2011)
Log Message
.: [Qt] [WK2] Disable the build with Qt versions older than 5.0
https://bugs.webkit.org/show_bug.cgi?id=65189
Reviewed by Csaba Osztrogonác.
* Source/WebKit.pro: Abort if not using Qt5.
Source/WebKit2: [Qt] [WK2] Disable the build with Qt versions older than 5.0
https://bugs.webkit.org/show_bug.cgi?id=65189
Reviewed by Csaba Osztrogonác.
* Platform/qt/ModuleQt.cpp:
(WebKit::Module::platformFunctionPointer): Fix the build for Qt5.
Modified Paths
Diff
Modified: trunk/ChangeLog (91765 => 91766)
--- trunk/ChangeLog 2011-07-26 17:53:40 UTC (rev 91765)
+++ trunk/ChangeLog 2011-07-26 18:09:55 UTC (rev 91766)
@@ -1,3 +1,12 @@
+2011-07-26 Andras Becsi <[email protected]>
+
+ [Qt] [WK2] Disable the build with Qt versions older than 5.0
+ https://bugs.webkit.org/show_bug.cgi?id=65189
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/WebKit.pro: Abort if not using Qt5.
+
2011-07-20 Pierre Rossi <[email protected]>
[Qt] Qt5 Build Fix: Disable the legacy mac assert macros.
Modified: trunk/Source/WebKit.pro (91765 => 91766)
--- trunk/Source/WebKit.pro 2011-07-26 17:53:40 UTC (rev 91765)
+++ trunk/Source/WebKit.pro 2011-07-26 18:09:55 UTC (rev 91766)
@@ -8,7 +8,14 @@
exists($$PWD/_javascript_Core/jsc.pro): SUBDIRS += _javascript_Core/jsc.pro
}
-webkit2:exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+webkit2 {
+ lessThan(QT_MAJOR_VERSION, 5) {
+ message("Building WebKit2 with Qt versions older than 5.0 is no longer supported.")
+ message("Read http://www.mail-archive.com/[email protected]/msg01674.html for more information.")
+ error("Aborting build.")
+ }
+ exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+}
SUBDIRS += WebCore
SUBDIRS += WebKit/qt/QtWebKit.pro
Modified: trunk/Source/WebKit2/ChangeLog (91765 => 91766)
--- trunk/Source/WebKit2/ChangeLog 2011-07-26 17:53:40 UTC (rev 91765)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-26 18:09:55 UTC (rev 91766)
@@ -1,3 +1,13 @@
+2011-07-26 Andras Becsi <[email protected]>
+
+ [Qt] [WK2] Disable the build with Qt versions older than 5.0
+ https://bugs.webkit.org/show_bug.cgi?id=65189
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Platform/qt/ModuleQt.cpp:
+ (WebKit::Module::platformFunctionPointer): Fix the build for Qt5.
+
2011-07-26 Benjamin Poulain <[email protected]>
[Qt][WK2] Make the WebContextMenuProxyQt handle the full interactions between the views and the WebPageProxy
Modified: trunk/Source/WebKit2/Platform/qt/ModuleQt.cpp (91765 => 91766)
--- trunk/Source/WebKit2/Platform/qt/ModuleQt.cpp 2011-07-26 17:53:40 UTC (rev 91765)
+++ trunk/Source/WebKit2/Platform/qt/ModuleQt.cpp 2011-07-26 18:09:55 UTC (rev 91766)
@@ -44,7 +44,7 @@
void* Module::platformFunctionPointer(const char* functionName) const
{
// Unfortunately QLibrary::resolve is not const.
- return const_cast<QLibrary*>(&m_lib)->resolve(functionName);
+ return reinterpret_cast<void*>(const_cast<QLibrary*>(&m_lib)->resolve(functionName));
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
