diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /WebKit.xcworkspace | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'WebKit.xcworkspace')
-rw-r--r-- | WebKit.xcworkspace/contents.xcworkspacedata | 3 | ||||
-rw-r--r-- | WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebKit.xcworkspace/contents.xcworkspacedata b/WebKit.xcworkspace/contents.xcworkspacedata index 89e2069fd..0910f212d 100644 --- a/WebKit.xcworkspace/contents.xcworkspacedata +++ b/WebKit.xcworkspace/contents.xcworkspacedata @@ -14,6 +14,9 @@ location = "group:Source/WebCore/WebCore.xcodeproj"> </FileRef> <FileRef + location = "group:Source/WebInspectorUI/WebInspectorUI.xcodeproj"> + </FileRef> + <FileRef location = "group:Source/WebKit/WebKit.xcodeproj"> </FileRef> <FileRef diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme index f7a1785be..fd2cca7eb 100644 --- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme +++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme @@ -118,14 +118,13 @@ </Testables> </TestAction> <LaunchAction - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "YES" debugDocumentVersioning = "YES" - enableOpenGLFrameCaptureMode = "0" allowLocationSimulation = "YES"> <PathRunnable FilePath = "/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment"> |