diff options
| author | root <root@rshg054.dnsready.net> | 2013-11-06 00:46:31 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-11-06 00:46:31 -0800 |
| commit | a52da684729842a87ef2e9faea91db09f2582588 (patch) | |
| tree | c0406eec1aaf0c268a14c8078d0c7f513aa08ca6 /extra/phonon/fix-qmake.patch | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Wed Nov 6 00:46:20 PST 2013
Diffstat (limited to 'extra/phonon/fix-qmake.patch')
| -rw-r--r-- | extra/phonon/fix-qmake.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch deleted file mode 100644 index 2add588d4..000000000 --- a/extra/phonon/fix-qmake.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Oswald Buddenhagen <ossi@kde.org> -Date: Sat, 27 Oct 2012 07:58:16 +0000 -Subject: remove unnecessary if() statement -X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=a8c431494d2a6f3785c132f14d00d38ea0e5b328 ---- -remove unnecessary if() statement - -as it happens, this works around a qmake breakage relating to parsing if() - -BUG: 295037 -FIXED-IN: 4.6.1 ---- - - ---- a/qt_phonon.pri -+++ b/qt_phonon.pri -@@ -3,7 +3,7 @@ - # the next build of Qt. So pretend we're not there in this case. - # This file is loaded by qt_config.prf, before .qmake.cache has been loaded. - # Consequently, we have to do some stunts to get values out of the cache. --if(!exists($$_QMAKE_CACHE_)| \ -- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ -+!exists($$_QMAKE_CACHE_)| \ -+ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \ - QT_CONFIG += phonon - - |