Title: [105733] trunk
- Revision
- 105733
- Author
- [email protected]
- Date
- 2012-01-24 05:32:07 -0800 (Tue, 24 Jan 2012)
Log Message
[Qt] Fix the build with the newes Qt5 hashes
https://bugs.webkit.org/show_bug.cgi?id=76657
Patch by Andras Becsi <[email protected]> on 2012-01-24
Reviewed by Simon Hausmann.
Source/WebCore:
No new tests needed.
* platform/graphics/cairo/OpenGLShims.cpp:
(WebCore::getProcAddress): Adopt API changes.
Tools:
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::MiniBrowserApplication): Disable the automatic touch->mouse event synthesis
for now to prevent an infinite loop where Qt always creates mouse events out of our touch mock events.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105732 => 105733)
--- trunk/Source/WebCore/ChangeLog 2012-01-24 13:30:53 UTC (rev 105732)
+++ trunk/Source/WebCore/ChangeLog 2012-01-24 13:32:07 UTC (rev 105733)
@@ -1,3 +1,15 @@
+2012-01-24 Andras Becsi <[email protected]>
+
+ [Qt] Fix the build with the newes Qt5 hashes
+ https://bugs.webkit.org/show_bug.cgi?id=76657
+
+ Reviewed by Simon Hausmann.
+
+ No new tests needed.
+
+ * platform/graphics/cairo/OpenGLShims.cpp:
+ (WebCore::getProcAddress): Adopt API changes.
+
2012-01-24 Ádám Kallai <[email protected]>
[Qt] Incremental build problem.
Modified: trunk/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp (105732 => 105733)
--- trunk/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp 2012-01-24 13:30:53 UTC (rev 105732)
+++ trunk/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp 2012-01-24 13:32:07 UTC (rev 105733)
@@ -42,7 +42,7 @@
#if PLATFORM(QT)
static void* getProcAddress(const char* procName)
{
- return QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName));
+ return reinterpret_cast<void*>(QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName)));
}
#else
typedef void* (*glGetProcAddressType) (const char* procName);
Modified: trunk/Tools/ChangeLog (105732 => 105733)
--- trunk/Tools/ChangeLog 2012-01-24 13:30:53 UTC (rev 105732)
+++ trunk/Tools/ChangeLog 2012-01-24 13:32:07 UTC (rev 105733)
@@ -1,3 +1,14 @@
+2012-01-24 Andras Becsi <[email protected]>
+
+ [Qt] Fix the build with the newes Qt5 hashes
+ https://bugs.webkit.org/show_bug.cgi?id=76657
+
+ Reviewed by Simon Hausmann.
+
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::MiniBrowserApplication): Disable the automatic touch->mouse event synthesis
+ for now to prevent an infinite loop where Qt always creates mouse events out of our touch mock events.
+
2012-01-24 Tor Arne Vestbø <[email protected]>
[Qt] Distinguish between Cygwin and cmd.exe in the way we set env variables
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (105732 => 105733)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-01-24 13:30:53 UTC (rev 105732)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-01-24 13:32:07 UTC (rev 105733)
@@ -75,6 +75,9 @@
setApplicationVersion("0.1");
handleUserOptions();
+
+ // FIXME: This should be removed as soon as we can flag touch mock events as synthesized throuch QWindowSystemInterface
+ qApp->setAttribute(Qt::AA_SynthesizeMouseForUnhandledTouchEvents, false);
}
bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
