diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
| commit | 319fe79dd01e03c4ef61311c336bcd77e1133f02 (patch) | |
| tree | c169d85b429a801fdc22ce27c25b7e4230eb320a /gnu/packages/patches/qt4-tests.patch | |
| parent | 9511de1ef8c59788f2c93ae6b0cb1e87e30824ab (diff) | |
| parent | a606ed89d4e3737beec2f3392bedba61904778f4 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/qt4-tests.patch')
| -rw-r--r-- | gnu/packages/patches/qt4-tests.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/gnu/packages/patches/qt4-tests.patch b/gnu/packages/patches/qt4-tests.patch deleted file mode 100644 index eb499ec76a..0000000000 --- a/gnu/packages/patches/qt4-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -Drop tests requiring a running X server, but not starting any. - -diff -ru qt-everywhere-opensource-src-4.8.5.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro ---- qt-everywhere-opensource-src-4.8.5.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro 2013-10-12 13:15:47.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro 2013-10-12 13:20:15.000000000 +0200 -@@ -1,15 +1,4 @@ - - TEMPLATE = subdirs --SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qwebinspector hybridPixmap -+SUBDIRS = - --linux-* { -- # This test bypasses the library and links the tested code's object itself. -- # This stresses the build system in some corners so we only run it on linux. -- SUBDIRS += MIMESniffing --} -- --contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativewebview --SUBDIRS += benchmarks/painting benchmarks/loading --contains(DEFINES, ENABLE_WEBGL=1) { -- SUBDIRS += benchmarks/webgl --} |