diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
| commit | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (patch) | |
| tree | ac1eaa76630f7bbc2fc3165c2c209d2a973fd929 /examples | |
| parent | de300d7a41b0e428ba11e6061c39580c54012dc9 (diff) | |
| parent | 7c2b43a5c824ed4d5493c233d84222be9f5865c3 (diff) | |
| download | Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.zip Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.gz Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (203 commits)
Fix compilation of OpenVG.
Fixed wrong qmake logic for Symbian.
Fixed a bug where a proxy widget received FocusIn over and over.
Fixed broken test.
Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.
Fix dependency so it works also on massive parrallel systems
Set PM_MenuScrollerHeight to zero
Change QS60Style to use combobox popup menu
This should likely get webkit linking again on windows/sbsv2
Handle Symbian's file name encoding, correctly.
Fix linking issues of QtOpenVG.dll
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Make sure target path exists in qmake_extra_pre_targetdep.flm
Added close button to Anomaly demo browser
...
Diffstat (limited to 'examples')
4 files changed, 3 insertions, 4 deletions
diff --git a/examples/graphicsview/padnavigator/padnavigator.qrc b/examples/graphicsview/padnavigator/padnavigator.qrc index 30ee8e1..b26ab92 100644 --- a/examples/graphicsview/padnavigator/padnavigator.qrc +++ b/examples/graphicsview/padnavigator/padnavigator.qrc @@ -9,6 +9,5 @@ <file>images/kopeteavailable.png</file> <file>images/metacontact_online.png</file> <file>images/minitools.png</file> - <file>images/blue_angle_swirl.jpg</file> </qresource> </RCC> diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro index 2b65f2f..edbf14d 100644 --- a/examples/network/fortuneclient/fortuneclient.pro +++ b/examples/network/fortuneclient/fortuneclient.pro @@ -11,7 +11,7 @@ INSTALLS += target sources symbian { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ LIBS += -lesock -lcommdb -linsock # For IAP selection TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro index acb285b..29ba313 100644 --- a/examples/network/fortuneserver/fortuneserver.pro +++ b/examples/network/fortuneserver/fortuneserver.pro @@ -12,7 +12,7 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000CF71 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ LIBS += -lesock -lcommdb -linsock # For IAP selection TARGET.CAPABILITY = "All -TCB" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro index 7438641..1215aea 100644 --- a/examples/network/network-chat/network-chat.pro +++ b/examples/network/network-chat/network-chat.pro @@ -20,7 +20,7 @@ INSTALLS += target sources symbian { include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ LIBS += -lesock -lcommdb -linsock # For IAP selection LIBS += -lcharconv TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData" |