diff options
author | axis <qt-info@nokia.com> | 2010-03-15 14:41:32 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-03-15 16:01:58 (GMT) |
commit | 1c8b5d83301455b8dabb9674503bb0990ca50909 (patch) | |
tree | f295bc4094da432bc1ea7eb4c83974cfeb02c355 /qmake | |
parent | c75ffa607d036cb54663984e03af58108ab98757 (diff) | |
download | Qt-1c8b5d83301455b8dabb9674503bb0990ca50909.zip Qt-1c8b5d83301455b8dabb9674503bb0990ca50909.tar.gz Qt-1c8b5d83301455b8dabb9674503bb0990ca50909.tar.bz2 |
Moved UID2 processing from cpp code to profiles.
This enables it to be used by all Symbian build systems.
RevBy: Miikka Heikkinen
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/symmake.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 393e56b..83d1149 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -315,23 +315,7 @@ void SymbianMakefileGenerator::init() // .mmp initMmpVariables(); - if (0 != project->values("TARGET.UID2").size()) { - uid2 = project->first("TARGET.UID2"); - } else if (project->isActiveConfig("stdbinary")) { - uid2 = "0x20004C45"; - } else { - if (targetType == TypeExe) { - if (project->values("QT").contains("gui", Qt::CaseInsensitive)) { - // exe and gui -> uid2 needed - uid2 = "0x100039CE"; - } else { - // exe but not gui: uid2 is ignored anyway -> set it to 0 - uid2 = "0"; - } - } else if (targetType == TypeDll || targetType == TypeLib || targetType == TypePlugin) { - uid2 = "0x1000008d"; - } - } + uid2 = project->first("TARGET.UID2"); uid2 = uid2.trimmed(); } |