Unreviewed trivial Qt build fix.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Nov 2012 10:12:12 +0000 (10:12 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Nov 2012 10:12:12 +0000 (10:12 +0000)
Surround imports from QtGui by QT_{BEGIN,END}_NAMESPACE to fix namespaced
builds.

* platform/graphics/qt/GraphicsContextQt.cpp:
* platform/graphics/qt/ImageQt.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@133447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
Source/WebCore/platform/graphics/qt/ImageQt.cpp

index f96314b..6603abb 100644 (file)
@@ -1,3 +1,13 @@
+2012-11-05  Simon Hausmann  <simon.hausmann@digia.com>
+
+        Unreviewed trivial Qt build fix.
+
+        Surround imports from QtGui by QT_{BEGIN,END}_NAMESPACE to fix namespaced
+        builds.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        * platform/graphics/qt/ImageQt.cpp:
+
 2012-11-05  Shinya Kawanaka  <shinyak@chromium.org>
 
         [Shadow] ShadowRoot type is not set correctly.
index 6f9bf26..78c682f 100644 (file)
@@ -67,7 +67,9 @@
 #include <wtf/MathExtras.h>
 
 #if OS(WINDOWS)
+QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP, int hbitmapFormat = 0);
+QT_END_NAMESPACE
 
 enum HBitmapFormat {
     HBitmapNoAlpha,
index fc01c40..83692fd 100644 (file)
@@ -52,7 +52,9 @@
 #include <math.h>
 
 #if OS(WINDOWS)
+QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP, int hbitmapFormat = 0);
+QT_END_NAMESPACE
 #endif
 
 typedef QHash<QByteArray, QPixmap> WebGraphicHash;