diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-03-18 16:15:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-18 17:25:46 +0100 |
| commit | d9c4f8fababcfe370881b4402994cbcd6fa05504 (patch) | |
| tree | 0c6be1a8cebc04fd73a348013689871db1f3e46a /Source/JavaScriptCore/heap/HeapTimer.h | |
| parent | a2e0d7c96a21cc48aa089938609669502cfdf407 (diff) | |
| download | qtwebkit-d9c4f8fababcfe370881b4402994cbcd6fa05504.tar.gz | |
[Qt] Fix the JSC build on Mac
Unreviewed, build fix.
* heap/HeapTimer.h:
Qt on Mac has USE(CF) true, and should use the CF HeapTimer in that case.
Change-Id: Ibf9d96a3492e47dc33e131322de16e52de00e5e5
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@141097 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/heap/HeapTimer.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/HeapTimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/heap/HeapTimer.h b/Source/JavaScriptCore/heap/HeapTimer.h index e0fcda672..66d28f228 100644 --- a/Source/JavaScriptCore/heap/HeapTimer.h +++ b/Source/JavaScriptCore/heap/HeapTimer.h @@ -44,7 +44,7 @@ namespace JSC { class JSGlobalData; -#if PLATFORM(QT) +#if PLATFORM(QT) && !USE(CF) class HeapTimer : public QObject { #else class HeapTimer { |