diff options
| author | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-09-13 15:15:52 +0000 |
|---|---|---|
| committer | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-09-13 15:15:52 +0000 |
| commit | 1f67e9bd9bd98001686a3fc28e1377e6c8e5fc0e (patch) | |
| tree | 6eb6763a8abc2745babf81496b0e3a6ec546eeb7 /third_party/WebKit/Tools/qmake | |
| parent | 3508ae42c81395153df0d295eec4bc12233b9810 (diff) | |
| download | chromium_src-1f67e9bd9bd98001686a3fc28e1377e6c8e5fc0e.zip chromium_src-1f67e9bd9bd98001686a3fc28e1377e6c8e5fc0e.tar.gz chromium_src-1f67e9bd9bd98001686a3fc28e1377e6c8e5fc0e.tar.bz2 | |
[Qt] Make WebKit2 work on Windows with Qt 5
https://bugs.webkit.org/show_bug.cgi?id=76776
Reviewed by Tor Arne Vestbø.
WebKit2 should compile with Qt on Windows now, so enable it. This patch in fact corrects
the check to disable WebKit when we don't have USE_3D_GRAPHICS available, because we need
that for the GL TextureMapper (it's only built when that feature is set).
* qmake/mkspecs/features/configure.prf:
git-svn-id: svn://svn.chromium.org/blink/trunk@128466 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Tools/qmake')
| -rw-r--r-- | third_party/WebKit/Tools/qmake/mkspecs/features/configure.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/configure.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/configure.prf index 849eeef..2551b51 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/configure.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/configure.prf @@ -54,8 +54,8 @@ defineTest(runConfigure) { WEBKIT_CONFIG -= build_webkit1 } - # WebKit2 not supported on Windows yet - win32*: WEBKIT_CONFIG -= build_webkit2 + # WebKit2 requires OpenGL TextureMapper, which requires 3D Graphics + !use?(3d_graphics): WEBKIT_CONFIG -= build_webkit2 export(CONFIG) export(WEBKIT_CONFIG) |