diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-29 09:55:17 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-29 14:01:08 +0200 |
commit | 9ba14ed272a22c9eff1f81664e2a02c617b90828 (patch) | |
tree | 56c51b69ea0f8fe8971a1fc6409b4db7d7cab751 /examples/script | |
parent | 1f2cb419ac2f776ee5bae1bcd877ea14e5a27a38 (diff) | |
parent | 3f515dcae3d5e4cd5571d3ae054fc64fc57e3c96 (diff) | |
download | qtscript-9ba14ed272a22c9eff1f81664e2a02c617b90828.tar.gz |
Merge remote branch 'gerrit/master' into refactor
Change-Id: I4e9fc2e2b8f53a7b20831225093126167030a382
Diffstat (limited to 'examples/script')
-rw-r--r-- | examples/script/README | 33 | ||||
-rw-r--r-- | examples/script/context2d/context2d.pro | 2 | ||||
-rw-r--r-- | examples/script/qstetrix/qstetrix.pro | 4 |
3 files changed, 4 insertions, 35 deletions
diff --git a/examples/script/README b/examples/script/README index 089a7fa..60fe33c 100644 --- a/examples/script/README +++ b/examples/script/README @@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of scripting applications with Qt. -The example launcher provided with Qt can be used to explore each of the -examples in this directory. - -Documentation for these examples can be found via the Tutorial and Examples +Documentation for these examples can be found via the Examples link in the main Qt documentation. - - -Finding the Qt Examples and Demos launcher -========================================== - -On Windows: - -The launcher can be accessed via the Windows Start menu. Select the menu -entry entitled "Qt Examples and Demos" entry in the submenu containing -the Qt tools. - -On Mac OS X: - -For the binary distribution, the qtdemo executable is installed in the -/Developer/Applications/Qt directory. For the source distribution, it is -installed alongside the other Qt tools on the path specified when Qt is -configured. - -On Unix/Linux: - -The qtdemo executable is installed alongside the other Qt tools on the path -specified when Qt is configured. - -On all platforms: - -The source code for the launcher can be found in the demos/qtdemo directory -in the Qt package. This example is built at the same time as the Qt libraries, -tools, examples, and demonstrations. diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index 7ce9623..d2bc25d 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -30,5 +30,5 @@ symbian:{ contextScripts.files = scripts DEPLOYMENT += contextScripts } -maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) +maemo5: CONFIG += qt_example diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro index fad66ce..10ac34f 100644 --- a/examples/script/qstetrix/qstetrix.pro +++ b/examples/script/qstetrix/qstetrix.pro @@ -15,7 +15,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) -maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) +symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example symbian: warning(This example does not work on Symbian platform) |