2008-05-13 Tor Arne Vestbø <tavestbo@trolltech.com>
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2008 15:22:44 +0000 (15:22 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2008 15:22:44 +0000 (15:22 +0000)
        Reviewed by Simon

        Fix QtWebKit build on Qt embedded.

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

WebCore/ChangeLog
WebCore/WebCore.pro
WebCore/platform/FileSystem.h
WebCore/platform/qt/FileSystemQt.cpp

index e214960..00cf63a 100644 (file)
@@ -1,3 +1,13 @@
+2008-05-13  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon
+
+        Fix QtWebKit build on Qt embedded.
+
+        * WebCore.pro:
+        * platform/FileSystem.h:
+        * platform/qt/FileSystemQt.cpp:
+
 2008-05-13  Ariya Hidayat  <ariya.hidayat@trolltech.com>
 
         Reviewed by Simon.
index 0d69e85..20d8f0c 100644 (file)
@@ -84,7 +84,7 @@ qt-port: !contains(DEFINES, ENABLE_SVG_USE=.): DEFINES += ENABLE_SVG_USE=1
 gtk-port:DEFINES += ENABLE_SVG=0
 qt-port:contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1
 else:DEFINES += ENABLE_VIDEO=0
-qt-port:unix:!mac: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
+qt-port:unix:!mac:!embedded: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
 gtk-port:x11:plugins: DEFINES += XP_UNIX ENABLE_NETSCAPE_PLUGIN_API=1
 qt-port: DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
 
index 505c82c..55ae0b0 100644 (file)
@@ -78,7 +78,7 @@ struct PlatformModuleVersion {
 
 typedef QFile* PlatformFileHandle;
 const PlatformFileHandle invalidPlatformFileHandle = 0;
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
 typedef QLibrary* PlatformModule;
 typedef unsigned PlatformModuleVersion;
 #elif defined(Q_OS_WIN32)
index f5aab10..e1c47b6 100644 (file)
@@ -127,7 +127,7 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
     return 0;
 }
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
 bool unloadModule(PlatformModule module)
 {
     if (module->unload()) {