Changeset 156797 in webkit
- Timestamp:
- Oct 2, 2013 2:27:12 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 25 deleted
- 10 edited
-
ChangeLog (modified) (1 diff)
-
DumpRenderTree/WorkQueue.cpp (modified) (1 diff)
-
DumpRenderTree/blackberry/src.pro (deleted)
-
DumpRenderTree/qt (deleted)
-
ImageDiff/ImageDiff.pro (deleted)
-
ImageDiff/qt (deleted)
-
MiniBrowser/qt (deleted)
-
QtTestBrowser (deleted)
-
TestWebKitAPI/DerivedSources.pri (deleted)
-
TestWebKitAPI/InjectedBundle.pri (deleted)
-
TestWebKitAPI/PlatformWebView.h (modified) (1 diff)
-
TestWebKitAPI/TestWebKitAPI.pri (deleted)
-
TestWebKitAPI/TestWebKitAPI.pro (deleted)
-
TestWebKitAPI/Tests.pri (deleted)
-
TestWebKitAPI/Tests/JavaScriptCore/JavaScriptCore.pro (deleted)
-
TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp (modified) (2 diffs)
-
TestWebKitAPI/Tests/WTF/WTF.pro (deleted)
-
TestWebKitAPI/Tests/WebKit2/WebKit2.pro (deleted)
-
TestWebKitAPI/qt (deleted)
-
Tools.pro (deleted)
-
WebKitTestRunner/DerivedSources.pri (deleted)
-
WebKitTestRunner/EventSenderProxy.h (modified) (3 diffs)
-
WebKitTestRunner/InjectedBundle/DerivedSources.pri (deleted)
-
WebKitTestRunner/InjectedBundle/InjectedBundle.pro (deleted)
-
WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (4 diffs)
-
WebKitTestRunner/InjectedBundle/Target.pri (deleted)
-
WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)
-
WebKitTestRunner/InjectedBundle/qt (deleted)
-
WebKitTestRunner/PlatformWebView.h (modified) (4 diffs)
-
WebKitTestRunner/Target.pri (deleted)
-
WebKitTestRunner/TestController.cpp (modified) (2 diffs)
-
WebKitTestRunner/TestController.h (modified) (1 diff)
-
WebKitTestRunner/WebKitTestRunner.pro (deleted)
-
WebKitTestRunner/qt (deleted)
-
qmake (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r156793 r156797 1 2013-10-02 Anders Carlsson <andersca@apple.com> 2 3 Remove Qt code from Tools/ 4 https://bugs.webkit.org/show_bug.cgi?id=122227 5 6 Reviewed by Andreas Kling. 7 8 * DumpRenderTree/WorkQueue.cpp: 9 * DumpRenderTree/blackberry/src.pro: Removed. 10 * DumpRenderTree/qt/DumpRenderTree.pro: Removed. 11 * DumpRenderTree/qt/DumpRenderTree.qrc: Removed. 12 * DumpRenderTree/qt/DumpRenderTreeMain.cpp: Removed. 13 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Removed. 14 * DumpRenderTree/qt/DumpRenderTreeQt.h: Removed. 15 * DumpRenderTree/qt/EventSenderQt.cpp: Removed. 16 * DumpRenderTree/qt/EventSenderQt.h: Removed. 17 * DumpRenderTree/qt/GCControllerQt.cpp: Removed. 18 * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Removed. 19 * DumpRenderTree/qt/TestRunnerQt.cpp: Removed. 20 * DumpRenderTree/qt/TestRunnerQt.h: Removed. 21 * DumpRenderTree/qt/TextInputControllerQt.cpp: Removed. 22 * DumpRenderTree/qt/TextInputControllerQt.h: Removed. 23 * DumpRenderTree/qt/WorkQueueItemQt.cpp: Removed. 24 * DumpRenderTree/qt/WorkQueueItemQt.h: Removed. 25 * DumpRenderTree/qt/fonts/AHEM____.TTF: Removed. 26 * DumpRenderTree/qt/resources/user.css: Removed. 27 * DumpRenderTree/qt/testplugin.cpp: Removed. 28 * DumpRenderTree/qt/testplugin.h: Removed. 29 * ImageDiff/ImageDiff.pro: Removed. 30 * ImageDiff/qt/ImageDiff.cpp: Removed. 31 * MiniBrowser/qt/BrowserWindow.cpp: Removed. 32 * MiniBrowser/qt/BrowserWindow.h: Removed. 33 * MiniBrowser/qt/MiniBrowser.pro: Removed. 34 * MiniBrowser/qt/MiniBrowser.qrc: Removed. 35 * MiniBrowser/qt/MiniBrowserApplication.cpp: Removed. 36 * MiniBrowser/qt/MiniBrowserApplication.h: Removed. 37 * MiniBrowser/qt/UrlLoader.cpp: Removed. 38 * MiniBrowser/qt/UrlLoader.h: Removed. 39 * MiniBrowser/qt/icons/checkbox_checked.png: Removed. 40 * MiniBrowser/qt/icons/checkbox_unchecked.png: Removed. 41 * MiniBrowser/qt/icons/contents_width.png: Removed. 42 * MiniBrowser/qt/icons/favicon.png: Removed. 43 * MiniBrowser/qt/icons/find.png: Removed. 44 * MiniBrowser/qt/icons/folder.png: Removed. 45 * MiniBrowser/qt/icons/info.png: Removed. 46 * MiniBrowser/qt/icons/next.png: Removed. 47 * MiniBrowser/qt/icons/plus.png: Removed. 48 * MiniBrowser/qt/icons/previous.png: Removed. 49 * MiniBrowser/qt/icons/refresh.png: Removed. 50 * MiniBrowser/qt/icons/stop.png: Removed. 51 * MiniBrowser/qt/icons/titlebar.png: Removed. 52 * MiniBrowser/qt/icons/touch.png: Removed. 53 * MiniBrowser/qt/icons/touchpoint.png: Removed. 54 * MiniBrowser/qt/icons/up.png: Removed. 55 * MiniBrowser/qt/js/MultiSelect.js: Removed. 56 * MiniBrowser/qt/main.cpp: Removed. 57 * MiniBrowser/qt/qml/AlertDialog.qml: Removed. 58 * MiniBrowser/qt/qml/AuthenticationDialog.qml: Removed. 59 * MiniBrowser/qt/qml/BrowserWindow.qml: Removed. 60 * MiniBrowser/qt/qml/CheckBox.qml: Removed. 61 * MiniBrowser/qt/qml/ColorChooser.qml: Removed. 62 * MiniBrowser/qt/qml/ConfirmDialog.qml: Removed. 63 * MiniBrowser/qt/qml/Dialog.qml: Removed. 64 * MiniBrowser/qt/qml/DialogButton.qml: Removed. 65 * MiniBrowser/qt/qml/DialogLineInput.qml: Removed. 66 * MiniBrowser/qt/qml/FilePicker.qml: Removed. 67 * MiniBrowser/qt/qml/ItemSelector.qml: Removed. 68 * MiniBrowser/qt/qml/MockTouchPoint.qml: Removed. 69 * MiniBrowser/qt/qml/PromptDialog.qml: Removed. 70 * MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml: Removed. 71 * MiniBrowser/qt/qml/ScrollIndicator.qml: Removed. 72 * MiniBrowser/qt/qml/ViewportInfoItem.qml: Removed. 73 * MiniBrowser/qt/raw/DerivedSources.pri: Removed. 74 * MiniBrowser/qt/raw/MiniBrowserRaw.pro: Removed. 75 * MiniBrowser/qt/raw/Target.pri: Removed. 76 * MiniBrowser/qt/raw/View.cpp: Removed. 77 * MiniBrowser/qt/raw/View.h: Removed. 78 * MiniBrowser/qt/utils.cpp: Removed. 79 * MiniBrowser/qt/utils.h: Removed. 80 * QtTestBrowser/QtTestBrowser.pro: Removed. 81 * QtTestBrowser/QtTestBrowser.qrc: Removed. 82 * QtTestBrowser/cookiejar.cpp: Removed. 83 * QtTestBrowser/cookiejar.h: Removed. 84 * QtTestBrowser/favicon.png: Removed. 85 * QtTestBrowser/fpstimer.cpp: Removed. 86 * QtTestBrowser/fpstimer.h: Removed. 87 * QtTestBrowser/launcherwindow.cpp: Removed. 88 * QtTestBrowser/launcherwindow.h: Removed. 89 * QtTestBrowser/locationedit.cpp: Removed. 90 * QtTestBrowser/locationedit.h: Removed. 91 * QtTestBrowser/mainwindow.cpp: Removed. 92 * QtTestBrowser/mainwindow.h: Removed. 93 * QtTestBrowser/qttestbrowser.cpp: Removed. 94 * QtTestBrowser/urlloader.cpp: Removed. 95 * QtTestBrowser/urlloader.h: Removed. 96 * QtTestBrowser/useragentlist.txt: Removed. 97 * QtTestBrowser/utils.cpp: Removed. 98 * QtTestBrowser/utils.h: Removed. 99 * QtTestBrowser/webinspector.h: Removed. 100 * QtTestBrowser/webpage.cpp: Removed. 101 * QtTestBrowser/webpage.h: Removed. 102 * QtTestBrowser/webview.cpp: Removed. 103 * QtTestBrowser/webview.h: Removed. 104 * TestWebKitAPI/DerivedSources.pri: Removed. 105 * TestWebKitAPI/InjectedBundle.pri: Removed. 106 * TestWebKitAPI/PlatformWebView.h: 107 * TestWebKitAPI/TestWebKitAPI.pri: Removed. 108 * TestWebKitAPI/TestWebKitAPI.pro: Removed. 109 * TestWebKitAPI/Tests.pri: Removed. 110 * TestWebKitAPI/Tests/JavaScriptCore/JavaScriptCore.pro: Removed. 111 * TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp: 112 * TestWebKitAPI/Tests/WTF/WTF.pro: Removed. 113 * TestWebKitAPI/Tests/WebKit2/WebKit2.pro: Removed. 114 * TestWebKitAPI/qt/InjectedBundleControllerQt.cpp: Removed. 115 * TestWebKitAPI/qt/PlatformUtilitiesQt.cpp: Removed. 116 * TestWebKitAPI/qt/PlatformWebViewQt.cpp: Removed. 117 * TestWebKitAPI/qt/main.cpp: Removed. 118 * Tools.pro: Removed. 119 * WebKitTestRunner/DerivedSources.pri: Removed. 120 * WebKitTestRunner/EventSenderProxy.h: 121 * WebKitTestRunner/InjectedBundle/DerivedSources.pri: Removed. 122 * WebKitTestRunner/InjectedBundle/InjectedBundle.pro: Removed. 123 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: 124 (WTR::InjectedBundlePage::resetAfterTest): 125 (WTR::InjectedBundlePage::dumpDOMAsWebArchive): 126 (WTR::InjectedBundlePage::didClearWindowForFrame): 127 * WebKitTestRunner/InjectedBundle/Target.pri: Removed. 128 * WebKitTestRunner/InjectedBundle/TestRunner.h: 129 * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp: Removed. 130 * WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp: Removed. 131 * WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Removed. 132 * WebKitTestRunner/PlatformWebView.h: 133 * WebKitTestRunner/Target.pri: Removed. 134 * WebKitTestRunner/TestController.cpp: 135 (WTR::TestController::resetStateToConsistentValues): 136 * WebKitTestRunner/TestController.h: 137 * WebKitTestRunner/WebKitTestRunner.pro: Removed. 138 * WebKitTestRunner/qt/EventSenderProxyQt.cpp: Removed. 139 * WebKitTestRunner/qt/PlatformWebViewQt.cpp: Removed. 140 * WebKitTestRunner/qt/TestControllerQt.cpp: Removed. 141 * WebKitTestRunner/qt/TestInvocationQt.cpp: Removed. 142 * WebKitTestRunner/qt/WebKitTestRunner.qrc: Removed. 143 * WebKitTestRunner/qt/main.cpp: Removed. 144 * WebKitTestRunner/qt/resources/user.css: Removed. 145 * qmake/.qmake.cache: Removed. 146 * qmake/.qmake.conf: Removed. 147 * qmake/README: Removed. 148 * qmake/config.tests/README: Removed. 149 * qmake/config.tests/fontconfig/fontconfig.cpp: Removed. 150 * qmake/config.tests/fontconfig/fontconfig.pro: Removed. 151 * qmake/config.tests/gccdepends/empty.cpp: Removed. 152 * qmake/config.tests/gccdepends/gccdepends.pro: Removed. 153 * qmake/config.tests/glx/glx.cpp: Removed. 154 * qmake/config.tests/glx/glx.pro: Removed. 155 * qmake/config.tests/gnuld/gnuld.pro: Removed. 156 * qmake/config.tests/gnuld/main.cpp: Removed. 157 * qmake/config.tests/libXcomposite/libXcomposite.cpp: Removed. 158 * qmake/config.tests/libXcomposite/libXcomposite.pro: Removed. 159 * qmake/config.tests/libXrender/libXrender.cpp: Removed. 160 * qmake/config.tests/libXrender/libXrender.pro: Removed. 161 * qmake/config.tests/libwebp/libwebp.cpp: Removed. 162 * qmake/config.tests/libwebp/libwebp.pro: Removed. 163 * qmake/config.tests/libxml2/libxml2.cpp: Removed. 164 * qmake/config.tests/libxml2/libxml2.pro: Removed. 165 * qmake/config.tests/libxslt/libxslt.cpp: Removed. 166 * qmake/config.tests/libxslt/libxslt.pro: Removed. 167 * qmake/config.tests/libzlib/libzlib.cpp: Removed. 168 * qmake/config.tests/libzlib/libzlib.pro: Removed. 169 * qmake/dump-features.pl: Removed. 170 * qmake/mkspecs/features/configure.prf: Removed. 171 * qmake/mkspecs/features/default_post.prf: Removed. 172 * qmake/mkspecs/features/default_pre.prf: Removed. 173 * qmake/mkspecs/features/features.prf: Removed. 174 * qmake/mkspecs/features/features.pri: Removed. 175 * qmake/mkspecs/features/force_static_libs_as_shared.prf: Removed. 176 * qmake/mkspecs/features/functions.prf: Removed. 177 * qmake/mkspecs/features/gprof.prf: Removed. 178 * qmake/mkspecs/features/mac/default_post.prf: Removed. 179 * qmake/mkspecs/features/mac/default_pre.prf: Removed. 180 * qmake/mkspecs/features/minimal_qt.prf: Removed. 181 * qmake/mkspecs/features/production_build.prf: Removed. 182 * qmake/mkspecs/features/rpath.prf: Removed. 183 * qmake/mkspecs/features/unix/default_post.prf: Removed. 184 * qmake/mkspecs/features/unix/default_pre.prf: Removed. 185 * qmake/mkspecs/features/unix/icc.prf: Removed. 186 * qmake/mkspecs/features/use_all_in_one_files.prf: Removed. 187 * qmake/mkspecs/features/valgrind.prf: Removed. 188 * qmake/mkspecs/features/webkit_modules.prf: Removed. 189 * qmake/mkspecs/features/win32/default_post.prf: Removed. 190 * qmake/mkspecs/features/win32/default_pre.prf: Removed. 191 * qmake/mkspecs/modules/angle.prf: Removed. 192 * qmake/mkspecs/modules/javascriptcore.prf: Removed. 193 * qmake/mkspecs/modules/webcore.prf: Removed. 194 * qmake/mkspecs/modules/webkit1.prf: Removed. 195 * qmake/mkspecs/modules/webkit2.prf: Removed. 196 * qmake/mkspecs/modules/wtf.prf: Removed. 197 1 198 2013-10-02 Tim Horton <timothy_horton@apple.com> 2 199 -
trunk/Tools/DumpRenderTree/WorkQueue.cpp
r101493 r156797 30 30 #include "WorkQueue.h" 31 31 32 #if PLATFORM(QT)33 #include "WorkQueueItemQt.h"34 #else35 32 #include "WorkQueueItem.h" 36 #endif37 33 #include <wtf/Assertions.h> 38 34 -
trunk/Tools/TestWebKitAPI/PlatformWebView.h
r147197 r156797 56 56 typedef Evas_Object* PlatformWKView; 57 57 typedef Ecore_Evas* PlatformWindow; 58 #elif PLATFORM(QT)59 QT_BEGIN_NAMESPACE60 class QQuickView;61 QT_END_NAMESPACE62 class QQuickWebView;63 typedef QQuickWebView* PlatformWKView;64 typedef QQuickView* PlatformWindow;65 58 #endif 66 59 -
trunk/Tools/TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp
r127991 r156797 43 43 44 44 template<> struct PrintfFormatTrait<long long> { static const char format[]; }; 45 #if OS(WINDOWS) && !PLATFORM(QT)45 #if OS(WINDOWS) 46 46 const char PrintfFormatTrait<long long>::format[] = "%I64i"; 47 47 #else 48 48 const char PrintfFormatTrait<long long>::format[] = "%lli"; 49 #endif // OS(WINDOWS) && !PLATFORM(QT)49 #endif // OS(WINDOWS) 50 50 51 51 template<> struct PrintfFormatTrait<unsigned short> { static const char format[]; }; … … 59 59 60 60 template<> struct PrintfFormatTrait<unsigned long long> { static const char format[]; }; 61 #if OS(WINDOWS) && !PLATFORM(QT)61 #if OS(WINDOWS) 62 62 const char PrintfFormatTrait<unsigned long long>::format[] = "%I64u"; 63 63 #else 64 64 const char PrintfFormatTrait<unsigned long long>::format[] = "%llu"; 65 #endif // OS(WINDOWS) && !PLATFORM(QT)65 #endif // OS(WINDOWS) 66 66 67 67 -
trunk/Tools/WebKitTestRunner/EventSenderProxy.h
r154949 r156797 30 30 #include <wtf/Deque.h> 31 31 32 #if PLATFORM(QT) 33 #include <QEvent> 34 #include <QTouchEvent> 35 #elif PLATFORM(GTK) 32 #if PLATFORM(GTK) 36 33 #include <gdk/gdk.h> 37 34 #elif PLATFORM(EFL) … … 87 84 void updateClickCountForButton(int button); 88 85 89 #if PLATFORM( QT) || PLATFORM(GTK) || PLATFORM(EFL)86 #if PLATFORM(GTK) || PLATFORM(EFL) 90 87 void replaySavedEvents(); 91 88 #endif 92 89 93 #if PLATFORM(QT) 94 #if ENABLE(TOUCH_EVENTS) 95 void sendTouchEvent(QEvent::Type); 96 #endif 97 void sendOrQueueEvent(QEvent*); 98 #elif PLATFORM(GTK) 90 #if PLATFORM(GTK) 99 91 void sendOrQueueEvent(GdkEvent*); 100 92 GdkEvent* createMouseButtonEvent(GdkEventType, unsigned button, WKEventModifiers); … … 119 111 Deque<WTREventQueueItem> m_eventQueue; 120 112 unsigned m_mouseButtonCurrentlyDown; 121 #elif PLATFORM(QT)122 Qt::MouseButtons m_mouseButtons;123 124 #if ENABLE(TOUCH_EVENTS)125 QList<QTouchEvent::TouchPoint> m_touchPoints;126 Qt::KeyboardModifiers m_touchModifiers;127 QPoint m_touchPointRadius;128 bool m_touchActive;129 #endif130 113 #elif PLATFORM(EFL) 131 114 Deque<WTREvent> m_eventQueue; -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
r154540 r156797 49 49 #include <wtf/text/StringBuilder.h> 50 50 51 #if USE(CF) && !PLATFORM(QT)51 #if USE(CF) 52 52 #include "WebArchiveDumpSupport.h" 53 #endif54 55 #if PLATFORM(QT)56 #include "DumpRenderTreeSupportQt.h"57 53 #endif 58 54 … … 429 425 WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page); 430 426 JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame); 431 #if PLATFORM(QT)432 DumpRenderTreeSupportQt::resetInternalsObject(context);433 #else434 427 WebCoreTestSupport::resetInternalsObject(context); 435 #endif436 428 assignedUrlsCache.clear(); 437 429 } … … 828 820 void InjectedBundlePage::dumpDOMAsWebArchive(WKBundleFrameRef frame, StringBuilder& stringBuilder) 829 821 { 830 #if USE(CF) && !PLATFORM(QT)822 #if USE(CF) 831 823 WKRetainPtr<WKDataRef> wkData = adoptWK(WKBundleFrameCopyWebArchive(frame)); 832 824 RetainPtr<CFDataRef> cfData = adoptCF(CFDataCreate(0, WKDataGetBytes(wkData.get()), WKDataGetSize(wkData.get()))); 833 825 RetainPtr<CFStringRef> cfString = adoptCF(createXMLStringFromWebArchiveData(cfData.get())); 834 826 stringBuilder.append(cfString.get()); 835 #else836 UNUSED_PARAM(frame);837 UNUSED_PARAM(stringBuilder);838 827 #endif 839 828 } … … 965 954 InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception); 966 955 967 #if PLATFORM(QT)968 DumpRenderTreeSupportQt::injectInternalsObject(context);969 #else970 956 WebCoreTestSupport::injectInternalsObject(context); 971 #endif972 957 } 973 958 -
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
r153376 r156797 40 40 #elif PLATFORM(WIN) 41 41 typedef UINT_PTR PlatformTimerRef; 42 #elif PLATFORM(QT)43 #include <QTimer>44 typedef QTimer PlatformTimerRef;45 42 #elif PLATFORM(GTK) 46 43 typedef unsigned int PlatformTimerRef; -
trunk/Tools/WebKitTestRunner/PlatformWebView.h
r155188 r156797 29 29 #include <WebKit2/WKRetainPtr.h> 30 30 31 #if defined(BUILDING_QT__) 32 QT_BEGIN_NAMESPACE 33 class QQuickView; 34 class QEventLoop; 35 QT_END_NAMESPACE 36 class QQuickWebView; 37 typedef QQuickWebView* PlatformWKView; 38 typedef QQuickView* PlatformWindow; 39 #elif defined(__APPLE__) && __APPLE__ 31 #if defined(__APPLE__) && __APPLE__ 40 32 #ifdef __OBJC__ 41 33 @class WKView; … … 78 70 void focus(); 79 71 80 #if PLATFORM(QT)81 bool sendEvent(QEvent*);82 void postEvent(QEvent*);83 void setModalEventLoop(QEventLoop* eventLoop) { m_modalEventLoop = eventLoop; }84 // Window snapshot can be disabled on Qt with QT_WEBKIT_DISABLE_UIPROCESS_DUMPPIXELS=1 environment variable (necessary for xvfb)85 static bool windowSnapshotEnabled();86 #else87 72 // Window snapshot is always enabled by default on all other platform. 88 73 static bool windowSnapshotEnabled() { return true; } 89 #endif90 74 91 75 WKRect windowFrame(); … … 100 84 bool windowIsKey() const { return m_windowIsKey; } 101 85 102 #if PLATFORM(MAC) || PLATFORM(EFL) || PLATFORM(QT)86 #if PLATFORM(MAC) || PLATFORM(EFL) 103 87 bool viewSupportsOptions(WKDictionaryRef) const; 104 88 #else … … 114 98 bool m_windowIsKey; 115 99 WKRetainPtr<WKDictionaryRef> m_options; 116 #if PLATFORM(EFL) || PLATFORM(QT)100 #if PLATFORM(EFL) 117 101 bool m_usingFixedLayout; 118 #endif119 #if PLATFORM(QT)120 QEventLoop* m_modalEventLoop;121 102 #endif 122 103 }; -
trunk/Tools/WebKitTestRunner/TestController.cpp
r154720 r156797 571 571 WKPreferencesSetMockScrollbarsEnabled(preferences, true); 572 572 573 #if !PLATFORM(QT)574 573 static WKStringRef standardFontFamily = WKStringCreateWithUTF8CString("Times"); 575 574 static WKStringRef cursiveFontFamily = WKStringCreateWithUTF8CString("Apple Chancery"); … … 587 586 WKPreferencesSetSansSerifFontFamily(preferences, sansSerifFontFamily); 588 587 WKPreferencesSetSerifFontFamily(preferences, serifFontFamily); 589 #endif590 588 WKPreferencesSetScreenFontSubstitutionEnabled(preferences, true); 591 589 WKPreferencesSetInspectorUsesWebKitUserInterface(preferences, true); -
trunk/Tools/WebKitTestRunner/TestController.h
r154949 r156797 220 220 OwnPtr<EventSenderProxy> m_eventSenderProxy; 221 221 222 #if PLATFORM(QT)223 class RunLoop;224 RunLoop* m_runLoop;225 #endif226 227 222 WorkQueueManager m_workQueueManager; 228 223 };
Note: See TracChangeset
for help on using the changeset viewer.
