summaryrefslogtreecommitdiff
path: root/Tools/DumpRenderTree
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-06-03 13:13:26 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-06 13:02:52 +0200
commit0c06c599cfa5a3235922494992712860c34dfcd3 (patch)
tree078896570f61ec29eb9454620c9c575b0eee4883 /Tools/DumpRenderTree
parentf64d11fc6fd0798fae2a1ecc7565b9d2efd385bc (diff)
downloadqtwebkit-0c06c599cfa5a3235922494992712860c34dfcd3.tar.gz
[Qt] Re-enable plugins on Mac.
https://bugs.webkit.org/show_bug.cgi?id=116622 Reviewed by Tor Arne Vestbø. Source/WebCore: * platform/FileSystem.h: * platform/qt/FileSystemQt.cpp: (WebCore::unloadModule): - Q_WS_* aren't defined since Qt5, use Q_OS_MACX instead. * plugins/mac/PluginPackageMac.cpp: (WebCore::PluginPackage::fetchInfo): (WebCore::PluginPackage::load): - createCFString now does the adoption itself. * plugins/mac/PluginViewMac.mm: - Add missing include. Source/WebKit/qt: * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::windowResizerRect): - Add missing parenthese. Tools: Plugins on Mac were only enabled if !embedded but the later was set if QPA is enabled, which is the default since Qt 5.0. Remove references to 'embedded' and fix various build issues, PluginViewMac.mm and PluginPackageMac.cpp haven't been compiled since a few months. * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: * qmake/mkspecs/features/features.prf: * qmake/mkspecs/features/unix/default_pre.prf: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151109 268f45cc-cd09-0410-ab3c-d52691b4dbfc Conflicts: Source/WebCore/platform/FileSystem.h Source/WebCore/plugins/mac/PluginPackageMac.cpp Change-Id: I38dc6170ca868b54f8092aa6b271ace4911a2390 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Tools/DumpRenderTree')
-rw-r--r--Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index f962ee18b..ae45c0331 100644
--- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -55,7 +55,7 @@ mac {
LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
}
-!win32:!embedded:!mac {
+!win32:!mac {
LIBS += -lX11
DEFINES += XP_UNIX
}