diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-31 13:38:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-19 12:55:30 +0100 |
| commit | 7fadba702cd13685a2a6e493452ab392c9a7373c (patch) | |
| tree | 50f246d1b9479c2791e821df877cc2cac1116e61 /src/quick | |
| parent | 61d982d601fa563fa53f527b8db4aceab5b47b2b (diff) | |
remove obsolete workarounds for qmake processing order problems
Change-Id: I4b58eee6243c92f67bdd9c8f9da36ef82a489c12
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/quick.pro | 14 |
1 files changed, 0 insertions, 14 deletions
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 :) -} - |