diff options
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 3b6ddfc61..af2b5ac93 100644 --- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro +++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro @@ -56,7 +56,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 8649780a3..aa8eaae61 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -74,7 +74,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 |