diff options
Diffstat (limited to 'examples/script')
-rw-r--r-- | examples/script/calculator/calculator.pro | 7 | ||||
-rw-r--r-- | examples/script/context2d/context2d.pro | 7 | ||||
-rw-r--r-- | examples/script/customclass/customclass.pro | 7 | ||||
-rw-r--r-- | examples/script/defaultprototypes/defaultprototypes.pro | 7 | ||||
-rw-r--r-- | examples/script/helloscript/helloscript.pro | 7 | ||||
-rw-r--r-- | examples/script/marshal/marshal.pro | 7 | ||||
-rw-r--r-- | examples/script/qscript/qscript.pro | 7 | ||||
-rw-r--r-- | examples/script/qsdbg/qsdbg.pro | 9 | ||||
-rw-r--r-- | examples/script/qstetrix/qstetrix.pro | 7 | ||||
-rw-r--r-- | examples/script/script.pro | 37 |
10 files changed, 43 insertions, 59 deletions
diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index db5fc71..a52e892 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -5,10 +5,7 @@ QMAKE_PROJECT_NAME = scripted_calculator contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index 8be9a56..6640c33 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -16,11 +16,8 @@ RESOURCES += context2d.qrc contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/customclass/customclass.pro b/examples/script/customclass/customclass.pro index 13dab7d..1edc511 100644 --- a/examples/script/customclass/customclass.pro +++ b/examples/script/customclass/customclass.pro @@ -6,10 +6,7 @@ SOURCES += main.cpp include(bytearrayclass.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.pri -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/customclass +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro index 4c5d1d3..8fa008d 100644 --- a/examples/script/defaultprototypes/defaultprototypes.pro +++ b/examples/script/defaultprototypes/defaultprototypes.pro @@ -3,10 +3,7 @@ RESOURCES += defaultprototypes.qrc SOURCES += main.cpp prototypes.cpp HEADERS += prototypes.h -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.js defaultprototypes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro index 5958afa..780c8a4 100644 --- a/examples/script/helloscript/helloscript.pro +++ b/examples/script/helloscript/helloscript.pro @@ -2,10 +2,7 @@ QT += widgets script RESOURCES += helloscript.qrc SOURCES += main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloscript.pro helloscript.js -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/marshal/marshal.pro b/examples/script/marshal/marshal.pro index 16da5af..39654e1 100644 --- a/examples/script/marshal/marshal.pro +++ b/examples/script/marshal/marshal.pro @@ -2,10 +2,7 @@ QT = core script CONFIG += console SOURCES += main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/marshal +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro index 895e46c..697d71b 100644 --- a/examples/script/qscript/qscript.pro +++ b/examples/script/qscript/qscript.pro @@ -7,10 +7,7 @@ SOURCES += main.cpp include(../customclass/bytearrayclass.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript -sources.files = $$RESOURCES $$FORMS main.cpp qscript.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/qscript +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro index c9270c9..0a23c36 100644 --- a/examples/script/qsdbg/qsdbg.pro +++ b/examples/script/qsdbg/qsdbg.pro @@ -6,10 +6,9 @@ SOURCES += main.cpp include(qsdbg.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -INSTALLS += target sources +EXAMPLE_FILES = *.js + +target.path = $$[QT_INSTALL_EXAMPLES]/script/qsdbg +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro index b978b48..08b972c 100644 --- a/examples/script/qstetrix/qstetrix.pro +++ b/examples/script/qstetrix/qstetrix.pro @@ -8,10 +8,7 @@ RESOURCES = tetrix.qrc contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/qstetrix +INSTALLS += target maemo5: CONFIG += qt_example diff --git a/examples/script/script.pro b/examples/script/script.pro index ef0ab01..245824c 100644 --- a/examples/script/script.pro +++ b/examples/script/script.pro @@ -1,20 +1,29 @@ TEMPLATE = subdirs -SUBDIRS = customclass -!contains(QT_CONFIG, no-gui):SUBDIRS += helloscript context2d defaultprototypes +SUBDIRS = \ + customclass \ + qsdbg -!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal -!wince*:SUBDIRS *= marshal +!isEmpty(QT.widgets.name) { + SUBDIRS += \ + helloscript \ + context2d \ + defaultprototypes -isEmpty(QT.widgets.name):SUBDIRS -= \ - context2d \ - defaultprototypes \ - helloscript \ - qscript + !isEmpty(QT.uitools.name) { + SUBDIRS += \ + calculator \ + qstetrix + } -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script -INSTALLS += target sources + !wince { + SUBDIRS += \ + qscript + } +} + +!wince { + SUBDIRS += \ + marshal +} maemo5: CONFIG += qt_example |