From 7fadba702cd13685a2a6e493452ab392c9a7373c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 31 Oct 2013 13:38:23 +0100 Subject: remove obsolete workarounds for qmake processing order problems Change-Id: I4b58eee6243c92f67bdd9c8f9da36ef82a489c12 Reviewed-by: Alan Alpert --- src/particles/particles.pro | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/particles/particles.pro') diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 71be71ae25..a57ac6772f 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -17,20 +17,3 @@ MODULE = quickparticles load(qt_module) include(particles.pri) - -mac { - # FIXME: this is a workaround for broken qmake logic in qtAddModule() - # This function refuses to use frameworks unless the framework exists on - # the filesystem at the time qmake is run, resulting in a build failure - # if QtQuick is qmaked before QtQml is built and frameworks are - # in use. qtAddLibrary() contains correct logic to deal with this, so - # we'll explicitly call that for now. - load(qt) - LIBS -= -lQtQml # in non-framework builds, these should be re-added - LIBS -= -lQtQml_debug # within the qtAddLibrary if appropriate, so no - qtAddLibrary(QtQml) # harm done :) - LIBS -= -lQtQuick - LIBS -= -lQtQuick_debug - qtAddLibrary(QtQuick) -} - -- cgit v1.2.3