diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-02 09:30:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 13:07:35 +0200 |
| commit | 8fc97fdfc76fc62e1faa23f8b768d1ec303329d4 (patch) | |
| tree | 3991bf746691a6c33615718dd05f6e23b9795ec6 /mkspecs | |
| parent | 585758389c64e556ef4808308dee27e19241581e (diff) | |
Revert Mac event loop changes.
"Make QGuiApplication::exec() run within NSApplicationMain()"
"Make Qt process native and timer events on Cocoa applications"
"Cocoa: Fix QFontDialog, QColorDialog auto-tests"
This reverts commits
1e14762b8d79118540bd09a84dd3e48f4f5e113e
e4b2a0b4bab2a17a65fedafe9bae50af1fe019f6
df7944e7d7dd8b2bbccbd639eff0ab09745d6cc3
Change-Id: I80b65b5ee0297b090f807bd420664233dfc44f7b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 4de0423f33..b183814e63 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,20 +1,6 @@ load(default_post) !no_objective_c:CONFIG += objective_c - -equals(TEMPLATE, app):qt: { - deps = $$replace(QT, -private$, ) - deps = $$resolve_depends(deps, "QT.", ".depends" ".private_depends" ".run_depends") - contains(deps, gui): { - DEFINES += QT_NEEDS_QMAIN - CONFIG += link_prl - # When CI'ing Qt we still need to link against libqtcocoamain.a, even before deployment. - # Hence the /get variable, suffix which looks for the libraries location effective path. - QMAKE_LIBDIR += $$[QT_INSTALL_LIBS/get] - QMAKE_LIBS += -lqtcocoamain - } -} - qt:!isEmpty(QT_CONFIG) { # Pick a suitable default architecture for qmake-based applications. # If the Qt package contains one of x86 and x86_64, pick that one. If it |