diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-22 13:46:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-31 23:46:37 +0200 |
| commit | d817da87976ac075316bbb4e90e8b4ef4f70f182 (patch) | |
| tree | c43e0d3e3fa5dd3a6cd482d4029fc5268bd0c776 | |
| parent | cd5acab7aaad27d1d645215c800c1a002e6f83cb (diff) | |
iOS: Specify framework dependencies in the right place
Instead of unconditionally linking to Foundation, UIKit, and QuartzCore,
we leave the dependencies for the iOS platform plugin, where the libs
are actually used.
Change-Id: Ie8cfad2c8230d1f1af6933b831e443fecb0c93f1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| -rw-r--r-- | mkspecs/common/ios/qmake.conf | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/plugin.pro | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 39465aa765..3c477438a3 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -15,9 +15,6 @@ QMAKE_RANLIB = ranlib -s QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX -# Basic iOS frameworks needed for any GUI app -QMAKE_LFLAGS += -framework Foundation -framework UIKit -framework QuartzCore -lz - # No OpenGL ES1 QMAKE_INCDIR_OPENGL_ES1 = QMAKE_LIBDIR_OPENGL_ES1 = diff --git a/src/plugins/platforms/ios/plugin.pro b/src/plugins/platforms/ios/plugin.pro index 591a0a67ed..5f46ea7ef5 100644 --- a/src/plugins/platforms/ios/plugin.pro +++ b/src/plugins/platforms/ios/plugin.pro @@ -4,7 +4,7 @@ PLUGIN_TYPE = platforms load(qt_plugin) QT += core-private gui-private platformsupport-private -LIBS += -framework UIKit -framework QuartzCore +LIBS += -framework Foundation -framework UIKit -framework QuartzCore OBJECTIVE_SOURCES = \ plugin.mm \ |