summaryrefslogtreecommitdiff
path: root/extra/phonon/fix-qmake.patch
blob: 2add588d49e5cf1c4846124e2bd0b29db2dd534b (plain)
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
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&amp;a=commitdiff&amp;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