diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-19 12:34:28 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-19 12:34:28 (GMT) |
| commit | e7d36a55746e6e3a2a66c47ee85cbfbfbe079c4e (patch) | |
| tree | 6e7a4cc2e237c847a28b3d97549abe0762f6795d /mkspecs | |
| parent | a1cfdc273bac90d58754c286810353ccb0be4b2e (diff) | |
| download | Qt-e7d36a55746e6e3a2a66c47ee85cbfbfbe079c4e.zip Qt-e7d36a55746e6e3a2a66c47ee85cbfbfbe079c4e.tar.gz Qt-e7d36a55746e6e3a2a66c47ee85cbfbfbe079c4e.tar.bz2 | |
Review fixes for qmake (project.cpp cleanup)
Removed symbian specific functionality from project.cpp:
- generate_test_uid qmake function removed
- Uids are now generated automatically for projects that don't have
one.
- Usage of ICON (in application_icon.prf) now requires explicit
UID3 definition.
- Autotests that require UID3 in .pro now define it explicitly
- Move most symbian specific function implementations away from
project.cpp to files under generators/symbian
Reviewed-by: Janne Anttila
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index ae58c5d..4ab5ac2 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -6,7 +6,6 @@ qtAddLibrary(QtTest) symbian:{ # qt.prf sets TARGET.EPOCSTACKSIZE and TARGET.EPOCHEAPSIZE # DEFINES += QTEST_NO_SPECIALIZATIONS - TARGET.UID3 = $$generate_test_uid($$TARGET) TARGET.CAPABILITY="ALL -TCB" RSS_RULES ="group_name=\"QtTests\";" } diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index df4bb1c..97b99a5 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -13,8 +13,8 @@ contains( CONFIG, no_icon ) { message("ICON keyword must have one or the same amout of items as in TRANSLATIONS keyword") } - # MIF files will have UID in their names, if TARGET.UID3 is not set we need to generate it - isEmpty(TARGET.UID3):TARGET.UID3 = $$generate_test_uid($$TARGET) + # MIF files will have UID in their names, if TARGET.UID3 is not set, remind the user + isEmpty(TARGET.UID3):error("TARGET.UID3 must be explicitly defined for ICON generation") # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code symbian-abld { |