diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:55:05 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:55:05 +1000 |
commit | e7395b807119843d6ce8c27012ac5dd1369d393a (patch) | |
tree | a73048b9e94bebdab14a43b0711f8fb2a9a7056d /examples/help | |
parent | 68c94ef3b71cda357fd37ed619f4bb71017615e0 (diff) | |
parent | 95df4086abadf0f1fc90cbd84f852c5b5c5d8aa5 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Squashed commit of changes from the 4.8-temp branch.
Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
Diffstat (limited to 'examples/help')
-rw-r--r-- | examples/help/contextsensitivehelp/contextsensitivehelp.desktop | 11 | ||||
-rw-r--r-- | examples/help/contextsensitivehelp/contextsensitivehelp.pro | 5 | ||||
-rw-r--r-- | examples/help/help.pro | 1 | ||||
-rw-r--r-- | examples/help/remotecontrol/remotecontrol.desktop | 11 | ||||
-rw-r--r-- | examples/help/remotecontrol/remotecontrol.pro | 5 | ||||
-rw-r--r-- | examples/help/simpletextviewer/simpletextviewer.desktop | 11 | ||||
-rw-r--r-- | examples/help/simpletextviewer/simpletextviewer.pro | 4 |
7 files changed, 48 insertions, 0 deletions
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.desktop b/examples/help/contextsensitivehelp/contextsensitivehelp.desktop new file mode 100644 index 000000000..3171065f8 --- /dev/null +++ b/examples/help/contextsensitivehelp/contextsensitivehelp.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=Context-Sensitive Help +Exec=/opt/usr/bin/contextsensitivehelp +Icon=contextsensitivehelp +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro index b37ffbceb..8941dcbb1 100644 --- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro +++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro @@ -18,3 +18,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp INSTALLS += target sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example + +symbian: warning(This example does not work on Symbian platform) +maemo5: warning(This example does not work on Maemo platform) +simulator: warning(This example does not work on Simulator platform) diff --git a/examples/help/help.pro b/examples/help/help.pro index 650b71b2c..57b01a302 100644 --- a/examples/help/help.pro +++ b/examples/help/help.pro @@ -11,3 +11,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help INSTALLS += sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example diff --git a/examples/help/remotecontrol/remotecontrol.desktop b/examples/help/remotecontrol/remotecontrol.desktop new file mode 100644 index 000000000..7a720550d --- /dev/null +++ b/examples/help/remotecontrol/remotecontrol.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=Remote Control +Exec=/opt/usr/bin/remotecontrol +Icon=remotecontrol +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro index 84780a72e..2212db040 100644 --- a/examples/help/remotecontrol/remotecontrol.pro +++ b/examples/help/remotecontrol/remotecontrol.pro @@ -13,3 +13,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/remotecontrol INSTALLS += target sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example + +symbian: warning(This example does not work on Symbian platform) +maemo5: warning(This example does not work on Maemo platform) +simulator: warning(This example does not work on Simulator platform) diff --git a/examples/help/simpletextviewer/simpletextviewer.desktop b/examples/help/simpletextviewer/simpletextviewer.desktop new file mode 100644 index 000000000..d72b602a9 --- /dev/null +++ b/examples/help/simpletextviewer/simpletextviewer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=Simple Text Viewer +Exec=/opt/usr/bin/simpletextviewer +Icon=simpletextviewer +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro index c2e97eab7..b51c141c0 100644 --- a/examples/help/simpletextviewer/simpletextviewer.pro +++ b/examples/help/simpletextviewer/simpletextviewer.pro @@ -15,4 +15,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer INSTALLS += target sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example +symbian: warning(This example does not work on Symbian platform) +maemo5: warning(This example does not work on Maemo platform) +simulator: warning(This example does not work on Simulator platform) |