diff options
Diffstat (limited to 'examples/sensors')
20 files changed, 29 insertions, 47 deletions
diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro index d0378bb3..b183bf41 100644 --- a/examples/sensors/accelbubble/accelbubble.pro +++ b/examples/sensors/accelbubble/accelbubble.pro @@ -6,12 +6,10 @@ SOURCES = main.cpp RESOURCES += \ accelbubble.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ content \ images -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/accelbubble -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/accelbubble +INSTALLS += target diff --git a/examples/sensors/accelbubble/icon.png b/examples/sensors/accelbubble/icon.png Binary files differdeleted file mode 100644 index d74f1111..00000000 --- a/examples/sensors/accelbubble/icon.png +++ /dev/null diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro index 9f543082..18191d38 100644 --- a/examples/sensors/cubehouse/cubehouse.pro +++ b/examples/sensors/cubehouse/cubehouse.pro @@ -3,15 +3,13 @@ TARGET = cubehouse QT += quick SOURCES = main.cpp -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ content \ mesh -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/cubehouse -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/cubehouse +INSTALLS += target RESOURCES += \ cubehouse.qrc diff --git a/examples/sensors/cubehouse/icon.png b/examples/sensors/cubehouse/icon.png Binary files differdeleted file mode 100644 index 193ad561..00000000 --- a/examples/sensors/cubehouse/icon.png +++ /dev/null diff --git a/examples/sensors/grue/icon.png b/examples/sensors/grue/icon.png Binary files differdeleted file mode 100644 index f3f038c7..00000000 --- a/examples/sensors/grue/icon.png +++ /dev/null diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro index 191098ec..11d2c1de 100644 --- a/examples/sensors/grue/qml.pro +++ b/examples/sensors/grue/qml.pro @@ -10,11 +10,9 @@ SOURCES = main.cpp RESOURCES += \ qml.qrc -app.files = \ - icon.png \ +OTHER_FILES = \ $$files(*.qml) \ grue.png target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -INSTALLS += target app +INSTALLS += target diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/sensors/maze/LabyrinthSquare.qml index 56b834a7..9fa19096 100644 --- a/examples/sensors/maze/LabyrinthSquare.qml +++ b/examples/sensors/maze/LabyrinthSquare.qml @@ -55,7 +55,7 @@ Rectangle { property int val: 0 property AnimatedImage picture: img - //Dependend of its position and the labyrinth value a square can be the start, cheese, empty or a wall + //Dependent of its position and the labyrinth value a square can be the start, cheese, empty or a wall AnimatedImage { id: img anchors.fill: parent diff --git a/examples/sensors/maze/icon.png b/examples/sensors/maze/icon.png Binary files differdeleted file mode 100644 index 1e7ff8d8..00000000 --- a/examples/sensors/maze/icon.png +++ /dev/null diff --git a/examples/sensors/maze/maze.pro b/examples/sensors/maze/maze.pro index b57c0a98..e4c4d866 100644 --- a/examples/sensors/maze/maze.pro +++ b/examples/sensors/maze/maze.pro @@ -3,16 +3,14 @@ TARGET = maze QT += quick SOURCES = main.cpp -app.files = \ +OTHER_FILES = \ components \ $$files(*.qml) \ $$files(*.js) \ - icon.png \ content -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/maze -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/maze +INSTALLS += target RESOURCES += \ maze.qrc diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/sensors/qmlqtsensors/icon.png Binary files differdeleted file mode 100644 index d3243c5b..00000000 --- a/examples/sensors/qmlqtsensors/icon.png +++ /dev/null diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro index b63bd6ac..6add64dc 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro @@ -6,11 +6,9 @@ SOURCES = main.cpp RESOURCES += \ qmlqtsensors.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ components -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlqtsensors -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors +INSTALLS += target diff --git a/examples/sensors/qmlsensorgestures/icon.png b/examples/sensors/qmlsensorgestures/icon.png Binary files differdeleted file mode 100644 index c445bd7f..00000000 --- a/examples/sensors/qmlsensorgestures/icon.png +++ /dev/null diff --git a/examples/sensors/qmlsensorgestures/qml.pro b/examples/sensors/qmlsensorgestures/qml.pro index 9bcba7fd..6191f322 100644 --- a/examples/sensors/qmlsensorgestures/qml.pro +++ b/examples/sensors/qmlsensorgestures/qml.pro @@ -3,13 +3,11 @@ TARGET = qmlsensorgestures QT += quick SOURCES = main.cpp -app.files = \ - $$files(*.qml) \ - icon.png +OTHER_FILES = \ + $$files(*.qml) -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/qmlsensorgestures -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlsensorgestures +INSTALLS += target RESOURCES += \ qml.qrc diff --git a/examples/sensors/sensor_explorer/icon.png b/examples/sensors/sensor_explorer/icon.png Binary files differdeleted file mode 100644 index c48b6095..00000000 --- a/examples/sensors/sensor_explorer/icon.png +++ /dev/null diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp index 1b14c6ae..c207d937 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.cpp +++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /* \class QSensorItem - \brief The QSensorItem type provides information about the meta-datas from a sensors installed on the system. + \brief The QSensorItem type provides information about the metadata from a sensors installed on the system. */ /* @@ -118,7 +118,7 @@ void QSensorItem::changePropertyValue(QPropertyInfo* property, const QString& va } /* - Reading the meta-datas and activates the sensor. + Reading the metadata and activates the sensor. */ void QSensorItem::select() { @@ -255,7 +255,7 @@ bool QSensorItem::isWriteable(const QString& propertyname) } /* - Convert the variant \a val dependend on the type \a type and returns the converted value as a QString + Convert the variant \a val dependent on the type \a type and returns the converted value as a QString */ QString QSensorItem::convertValue(const QString& type, const QVariant& val) { diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro index e2324a84..1407d5b2 100644 --- a/examples/sensors/sensor_explorer/qml.pro +++ b/examples/sensors/sensor_explorer/qml.pro @@ -11,13 +11,11 @@ win32: DESTDIR = ./ SOURCES = main.cpp -app.files = \ - sensor_explorer.qml \ - icon.png +OTHER_FILES = \ + sensor_explorer.qml target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -app.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -INSTALLS += target app +INSTALLS += target RESOURCES += \ qml.qrc diff --git a/examples/sensors/sensorgestures/gesture.png b/examples/sensors/sensorgestures/gesture.png Binary files differdeleted file mode 100644 index 707d5c4e..00000000 --- a/examples/sensors/sensorgestures/gesture.png +++ /dev/null diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro index 38a471d6..a60728e7 100644 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ b/examples/sensors/sensorgestures/sensorgestures.pro @@ -9,7 +9,5 @@ HEADERS += mainwindow.h FORMS += mainwindow.ui -target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures -app.files = gesture.png -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/sensorgestures -INSTALLS += target app +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorgestures +INSTALLS += target diff --git a/examples/sensors/shakeit/icon.png b/examples/sensors/shakeit/icon.png Binary files differdeleted file mode 100644 index d8f21546..00000000 --- a/examples/sensors/shakeit/icon.png +++ /dev/null diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro index cb36f739..5e07f062 100644 --- a/examples/sensors/shakeit/shakeit.pro +++ b/examples/sensors/shakeit/shakeit.pro @@ -6,12 +6,10 @@ SOURCES = main.cpp RESOURCES += \ shakeit.qrc -app.files = \ +OTHER_FILES = \ $$files(*.qml) \ - icon.png \ audio \ content target.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit -app.path = $$[QT_INSTALL_EXAMPLES]/qtsensors/shakeit -INSTALLS += target app +INSTALLS += target |