diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit.pri | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit.pri')
| -rw-r--r-- | Source/WebKit.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebKit.pri b/Source/WebKit.pri index f61b489..c76066f 100644 --- a/Source/WebKit.pri +++ b/Source/WebKit.pri @@ -73,6 +73,8 @@ INCLUDEPATH += \ $$OUTPUT_DIR/include \ $$QT.script.includes +DEFINES += QT_ASCII_CAST_WARNINGS + webkit2:INCLUDEPATH *= $$OUTPUT_DIR/include/WebKit2 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC @@ -93,7 +95,7 @@ linux-g++* { symbian|*-armcc { # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT - RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 + RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 --signed_bitfields RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates # Make debug symbols leaner in RVCT4.x. Ignored by compiler for release builds QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities @@ -132,9 +134,9 @@ symbian|maemo5|maemo6 { #### -contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS +!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS -!contains(QT_CONFIG, modular) { +isEmpty(QT.phonon.includes) { QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon QT.phonon.libs = $$QMAKE_LIBDIR_QT } |