diff options
| -rw-r--r-- | src/particles/particles.pro | 17 | ||||
| -rw-r--r-- | src/quick/quick.pro | 14 |
2 files changed, 0 insertions, 31 deletions
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) -} - diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 7c540591ab..5b564f7441 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -40,17 +40,3 @@ SOURCES += qtquick2.cpp # To make #include "qquickcontext2d_jsclass.cpp" work INCLUDEPATH += $$PWD - -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 :) -} - |