diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-03 13:13:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 13:02:52 +0200 |
| commit | 0c06c599cfa5a3235922494992712860c34dfcd3 (patch) | |
| tree | 078896570f61ec29eb9454620c9c575b0eee4883 /Tools | |
| parent | f64d11fc6fd0798fae2a1ecc7565b9d2efd385bc (diff) | |
| download | qtwebkit-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')
| -rw-r--r-- | Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/unix/default_pre.prf | 4 |
3 files changed, 2 insertions, 6 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 } diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index cf6dc7fac..3a17133a6 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -71,7 +71,7 @@ defineTest(detectFeatures) { plugin_architecture_x11 \ plugin_process - } else: unix|win32-*:!embedded:!wince* { + } else: mac|win32 { WEBKIT_CONFIG += netscape_plugin_api # WebKit2 WEBKIT_CONFIG += plugin_architecture_unsupported diff --git a/Tools/qmake/mkspecs/features/unix/default_pre.prf b/Tools/qmake/mkspecs/features/unix/default_pre.prf index aafc48ceb..60de13338 100644 --- a/Tools/qmake/mkspecs/features/unix/default_pre.prf +++ b/Tools/qmake/mkspecs/features/unix/default_pre.prf @@ -12,10 +12,6 @@ CONFIG += object_parallel_to_source SBOX_CHECK = $$(_SBOX_DIR) !isEmpty(SBOX_CHECK): CONFIG += scratchbox -# If Qt is configured with embedded or QPA we set a convenience config -# flag that can be used to test for either of these situations. -contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded - # Reduce linking memory pressure on 32-bit debug builds on Linux linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files |