diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit.pri | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit.pri')
| -rw-r--r-- | Source/WebKit.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit.pri b/Source/WebKit.pri index c76066f..c17d08a 100644 --- a/Source/WebKit.pri +++ b/Source/WebKit.pri @@ -1,5 +1,7 @@ # Include file to make it easy to include WebKit into Qt projects +contains(QT_CONFIG, qpa):CONFIG += embedded + # Detect that we are building as a standalone package by the presence of # either the generated files directory or as part of the Qt package through # QTDIR_build @@ -132,9 +134,12 @@ symbian|maemo5|maemo6 { CONFIG += include_webinspector } +*sh4* { + CONFIG += disable_uitools +} #### -!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS +disable_uitools: DEFINES *= QT_NO_UITOOLS isEmpty(QT.phonon.includes) { QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon |