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/qt/tests/tests.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/qt/tests/tests.pri')
| -rw-r--r-- | Source/WebKit/qt/tests/tests.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/tests/tests.pri b/Source/WebKit/qt/tests/tests.pri index ebb6f8e..3b0c358 100644 --- a/Source/WebKit/qt/tests/tests.pri +++ b/Source/WebKit/qt/tests/tests.pri @@ -10,8 +10,8 @@ ELSE { TARGET = tst_$$TARGET } load(mobilityconfig, true) contains(MOBILITY_CONFIG, multimedia) { # This define is used by tests depending on Qt Multimedia - DEFINES -= ENABLE_QT_MULTIMEDIA=0 - DEFINES += ENABLE_QT_MULTIMEDIA=1 + DEFINES -= WTF_USE_QT_MULTIMEDIA=0 + DEFINES += WTF_USE_QT_MULTIMEDIA=1 } SOURCES += $${TARGET}.cpp |