1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Author: Pino Toscano <pino@debian.org>
Description: Use the glibc and hurd mkspecs when necessary.
- wtf.pri: enable the glib support (needed to compile the GStreamer support)
- WebKit.pri: add -Werror on non-Linux i386/amd64 archs, and -Wno-c++0x-compat
for all the non-Linux ones
The glibc part is Debian-specific, as upstream does not have the glibc-g++
mkspec, while the hurd part could be upstreamed.
Last-Update: 2012-05-01
Origin: vendor
Forwarded: not-needed
---
Source/JavaScriptCore/wtf/wtf.pri | 2 +-
Source/WebKit.pri | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/Source/JavaScriptCore/wtf/wtf.pri
+++ b/Source/JavaScriptCore/wtf/wtf.pri
@@ -41,7 +41,7 @@ SOURCES += \
wtf/unicode/icu/CollatorICU.cpp \
wtf/unicode/UTF8.cpp
-linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+linux-*|glibc-*|hurd-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
!contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES += ENABLE_GLIB_SUPPORT=1
PKGCONFIG += glib-2.0 gio-2.0
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -113,7 +113,7 @@ CONFIG -= warn_on
*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
# Treat warnings as errors on x86/Linux/GCC
-linux-g++* {
+linux-g++*|glibc-*|hurd-* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
|
