diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-14 15:37:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 12:09:49 +0200 |
| commit | 686c380808d18e4c1fae5440b48cc3c3ace2d110 (patch) | |
| tree | 922bd6f2b3396c33affbb17b2d38fb052a915a50 /Source | |
| parent | 4354f29ee16b127667b4481e55dc415739f5f342 (diff) | |
| download | qtwebkit-686c380808d18e4c1fae5440b48cc3c3ace2d110.tar.gz | |
Define use_glib in features.prf
When we use GStreamer we need to define USE(GLIB), we currently do this
separately in WTF and WebCore. This should instead be done centrally to
make the it consistent.
Change-Id: I079dbeaf99b091ea2ecd093bfef1428d963f8300
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WTF/WTF.pri | 5 | ||||
| -rw-r--r-- | Source/WTF/wtf/CurrentTime.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 9 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 3122e689f..8b3ce98b5 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -20,9 +20,8 @@ mac { } } -use?(GSTREAMER) { - DEFINES += WTF_USE_GLIB=1 - PKGCONFIG += glib-2.0 gio-2.0 +use?(GLIB) { + PKGCONFIG *= glib-2.0 gio-2.0 } win32-* { diff --git a/Source/WTF/wtf/CurrentTime.cpp b/Source/WTF/wtf/CurrentTime.cpp index 627d25573..e7326df04 100644 --- a/Source/WTF/wtf/CurrentTime.cpp +++ b/Source/WTF/wtf/CurrentTime.cpp @@ -55,7 +55,7 @@ #include <sys/time.h> #endif -#if USE(GLIB) && !PLATFORM(EFL) +#if USE(GLIB) && !PLATFORM(EFL) && !PLATFORM(QT) #include <glib.h> #endif @@ -222,7 +222,7 @@ double currentTime() #endif // USE(QUERY_PERFORMANCE_COUNTER) -#elif USE(GLIB) && !PLATFORM(EFL) +#elif USE(GLIB) && !PLATFORM(EFL) && !PLATFORM(QT) // Note: GTK on Windows will pick up the PLATFORM(WIN) implementation above which provides // better accuracy compared with Windows implementation of g_get_current_time: diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index d3aa6fd03..01f7da929 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -168,14 +168,17 @@ enable?(GAMEPAD) { PKGCONFIG += libudev } +use?(GLIB) { + PKGCONFIG *= glib-2.0 gio-2.0 +} + use?(GSTREAMER) { - DEFINES += WTF_USE_GLIB=1 use?(GSTREAMER010) { - PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10 + PKGCONFIG += gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10 } else { DEFINES += GST_API_VERSION=1.0 DEFINES += GST_API_VERSION_1 - PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 + PKGCONFIG += gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 } } |