From 9f85fc8847d178af0e9e9039d80cd017d1c9324b Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 3 Sep 2009 13:52:51 +0300 Subject: Added missing TARGET.UID3 definitions to various components. Every non-test binary built for Symbian needs explicitly assigned UID3, so added TARGET.UID3 for components that were missing it. Reviewed-by: Janne Anttila --- demos/embedded/digiflip/digiflip.pro | 6 ++++++ demos/embedded/flickable/flickable.pro | 5 +++++ demos/embedded/flightinfo/flightinfo.pro | 2 ++ demos/embedded/lightmaps/lightmaps.pro | 2 ++ demos/embedded/raycasting/raycasting.pro | 5 +++++ demos/embedded/weatherinfo/weatherinfo.pro | 2 ++ examples/multimedia/audio/audiodevices/audiodevices.pro | 5 +++++ examples/multimedia/audio/audioinput/audioinput.pro | 4 ++++ examples/multimedia/audio/audiooutput/audiooutput.pro | 5 +++++ examples/uitools/multipleinheritance/multipleinheritance.pro | 5 ++++- examples/video/videographicsitem/videographicsitem.pro | 5 +++++ examples/video/videowidget/videowidget.pro | 5 +++++ src/multimedia/multimedia.pro | 2 ++ tools/designer/src/uitools/uitools.pro | 1 + 14 files changed, 53 insertions(+), 1 deletion(-) diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro index 6654088..4db5171 100644 --- a/demos/embedded/digiflip/digiflip.pro +++ b/demos/embedded/digiflip/digiflip.pro @@ -1 +1,7 @@ SOURCES = digiflip.cpp + +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF72 +} + diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro index 3c021dd..02e88aa 100644 --- a/demos/embedded/flickable/flickable.pro +++ b/demos/embedded/flickable/flickable.pro @@ -1,2 +1,7 @@ SOURCES = flickable.cpp main.cpp HEADERS = flickable.h + +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF73 +} diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index 5edb175..461c701 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -6,6 +6,8 @@ RESOURCES = flightinfo.qrc QT += network symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF74 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h LIBS += -lesock -lconnmon TARGET.CAPABILITY = NetworkServices diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index e57d15d..137183a 100644 --- a/demos/embedded/lightmaps/lightmaps.pro +++ b/demos/embedded/lightmaps/lightmaps.pro @@ -3,6 +3,8 @@ SOURCES = lightmaps.cpp QT += network symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF75 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h LIBS += -lesock -lconnmon TARGET.CAPABILITY = NetworkServices diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro index dae9412..19e0212 100644 --- a/demos/embedded/raycasting/raycasting.pro +++ b/demos/embedded/raycasting/raycasting.pro @@ -1,3 +1,8 @@ TEMPLATE = app SOURCES = raycasting.cpp RESOURCES += raycasting.qrc + +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF76 +} diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro index a89acba..0a579b0 100644 --- a/demos/embedded/weatherinfo/weatherinfo.pro +++ b/demos/embedded/weatherinfo/weatherinfo.pro @@ -5,6 +5,8 @@ RESOURCES = weatherinfo.qrc QT += network svg symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF77 HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h LIBS += -lesock -lconnmon TARGET.CAPABILITY = NetworkServices diff --git a/examples/multimedia/audio/audiodevices/audiodevices.pro b/examples/multimedia/audio/audiodevices/audiodevices.pro index adc4890..2c078ba 100644 --- a/examples/multimedia/audio/audiodevices/audiodevices.pro +++ b/examples/multimedia/audio/audiodevices/audiodevices.pro @@ -10,3 +10,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiodevices.pro sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices INSTALLS += target sources + +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7BE +} diff --git a/examples/multimedia/audio/audioinput/audioinput.pro b/examples/multimedia/audio/audioinput/audioinput.pro index d930750..139240e 100644 --- a/examples/multimedia/audio/audioinput/audioinput.pro +++ b/examples/multimedia/audio/audioinput/audioinput.pro @@ -10,3 +10,7 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audioinput.pro sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput INSTALLS += target sources +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7BF +} diff --git a/examples/multimedia/audio/audiooutput/audiooutput.pro b/examples/multimedia/audio/audiooutput/audiooutput.pro index 08f43ce..e2069cf 100644 --- a/examples/multimedia/audio/audiooutput/audiooutput.pro +++ b/examples/multimedia/audio/audiooutput/audiooutput.pro @@ -9,3 +9,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiooutput.pro sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput INSTALLS += target sources + +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7C0 +} diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index e8f59fb..b401c05 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -10,4 +10,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7C1 +} \ No newline at end of file diff --git a/examples/video/videographicsitem/videographicsitem.pro b/examples/video/videographicsitem/videographicsitem.pro index 7e0b4c5..7ebd975 100644 --- a/examples/video/videographicsitem/videographicsitem.pro +++ b/examples/video/videographicsitem/videographicsitem.pro @@ -14,3 +14,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images sources.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem INSTALLS += target sources + +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7C2 +} diff --git a/examples/video/videowidget/videowidget.pro b/examples/video/videowidget/videowidget.pro index a006f2f..cc0260f 100644 --- a/examples/video/videowidget/videowidget.pro +++ b/examples/video/videowidget/videowidget.pro @@ -12,3 +12,8 @@ SOURCES = \ videoplayer.cpp \ videowidget.cpp \ videowidgetsurface.cpp + +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.UID3 = 0xA000D7C3 +} diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 53fcb49..c729103 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -10,3 +10,5 @@ include(../qbase.pri) include(audio/audio.pri) include(video/video.pri) + +symbian: TARGET.UID3 = 0x2001E627 \ No newline at end of file diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro index 34e4877..38b7add 100644 --- a/tools/designer/src/uitools/uitools.pro +++ b/tools/designer/src/uitools/uitools.pro @@ -39,3 +39,4 @@ unix { QMAKE_PKGCONFIG_REQUIRES += QtXml } +symbian: TARGET.UID3 = 0x2001E628 -- cgit v0.12