diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-03-06 14:53:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 19:03:21 +0100 |
| commit | c6a689f64fa4d2db55206ef7d63baebdf4c7befd (patch) | |
| tree | fb189a2b34861e13d63224bd56f1c4ecc8fbf55f /qmake/generators/makefile.h | |
| parent | 6c55e553075816f6980cfa59d8e405650cebb3a5 (diff) | |
Make .prl file generation work for iOS again.
d28073d9 creates a distinction between "mac" and
"macx". The latter is not set on iOS, which caused
MakefileGenerator::target_mode to be set to TARG_UNIX_MODE.
Check for the "mac" active config instead of "macx".
Rename TARG_MACX_MODE -> TARG_MAC_MODE.
Change-Id: I7192788c33f5723034ba76da2492379dd454f0ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 2f3e73ff6b..e1447c61c3 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -90,7 +90,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo mutable QHash<ReplaceExtraCompilerCacheKey, QString> extraCompilerVariablesCache; protected: - enum TARG_MODE { TARG_UNIX_MODE, TARG_MACX_MODE, TARG_WIN_MODE } target_mode; + enum TARG_MODE { TARG_UNIX_MODE, TARG_MAC_MODE, TARG_WIN_MODE } target_mode; ProStringList createObjectList(const ProStringList &sources); |