From a8c431494d2a6f3785c132f14d00d38ea0e5b328 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 27 Oct 2012 09:58:16 +0200 Subject: [PATCH 11/12] remove unnecessary if() statement as it happens, this works around a qmake breakage relating to parsing if() BUG: 295037 FIXED-IN: 4.6.1 --- qt_phonon.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt_phonon.pri b/qt_phonon.pri index 08de2e2..daf824f 100644 --- a/qt_phonon.pri +++ b/qt_phonon.pri @@ -3,6 +3,6 @@ # 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 -- 1.8.3.1