summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basicsuite/demos.xml24
-rw-r--r--basicsuite/qtwebbrowser/app.pro13
-rw-r--r--basicsuite/qtwebbrowser/lib.pro29
-rw-r--r--basicsuite/qtwebbrowser/main.qml3
-rw-r--r--basicsuite/qtwebbrowser/qtwebbrowser.pro31
-rw-r--r--wayland/democompositor/democompositor.pro2
-rw-r--r--wayland/democompositor/democompositor.qrc8
-rw-r--r--wayland/democompositor/images/Icon_Clocks.pngbin0 -> 1870 bytes
-rw-r--r--wayland/democompositor/images/Icon_Maps.pngbin0 -> 1529 bytes
-rw-r--r--wayland/democompositor/images/Icon_RSS.pngbin0 -> 1769 bytes
-rw-r--r--wayland/democompositor/images/Icon_StocQt.pngbin0 -> 1639 bytes
-rw-r--r--wayland/democompositor/qml/MyButton.qml2
-rw-r--r--wayland/democompositor/qml/Screen.qml8
13 files changed, 70 insertions, 50 deletions
diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml
index 66f2b42..690d1ee 100644
--- a/basicsuite/demos.xml
+++ b/basicsuite/demos.xml
@@ -7,7 +7,7 @@ Provides an introduction to what Qt for Device Creation is all about.
</description>
</application>
-<application title="Camera" location="/data/user/qt/camera" main="main.qml" icon="/data/user/qt/camera/preview_l.jpg" exclude="android-beaglebone;android-iMX6;android-emulator;android-nexus7v2;linux-beagleboard;linux-beaglebone;linux-raspberrypi;linux-emulator;linux-apalis-imx6;linux-colibri-vf">
+<application title="Camera" location="/data/user/qt/camera" main="main.qml" icon="/data/user/qt/camera/preview_l.jpg" exclude="linux-beagleboard;linux-beaglebone;linux-raspberrypi;linux-emulator;linux-apalis-imx6;linux-colibri-vf">
<description>
This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick.
@@ -15,7 +15,7 @@ Demo can be used to take photos which are saved in the /data/images/ directory.
</description>
</application>
-<application title="Qt Canvas3D - Planets" location="/data/user/qt/canvas3d-planets" main="main.qml" icon="/data/user/qt/canvas3d-planets/preview_l.jpg" exclude="linux-raspberrypi;linux-beaglebone;android-beaglebone;linux-colibri-vf">
+<application title="Qt Canvas3D - Planets" location="/data/user/qt/canvas3d-planets" main="main.qml" icon="/data/user/qt/canvas3d-planets/preview_l.jpg" exclude="linux-emulator;linux-raspberrypi2;linux-raspberrypi;linux-beaglebone;linux-colibri-vf">
<description>
The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls.
</description>
@@ -41,21 +41,21 @@ The Flat Style Gallery example showcases the Qt Quick Controls. This demo combin
</description>
</application>
-<application title="Qt Data Visualization 3D - Surface Multiseries" location="/data/user/qt/enterprise-qtdatavis3d" main="main.qml" icon="/data/user/qt/enterprise-qtdatavis3d/preview_l.jpg" exclude="linux-raspberrypi;linux-raspberrypi2;android-beaglebone;linux-colibri-vf">
+<application title="Qt Data Visualization 3D - Surface Multiseries" location="/data/user/qt/enterprise-qtdatavis3d" main="main.qml" icon="/data/user/qt/enterprise-qtdatavis3d/preview_l.jpg" exclude="linux-raspberrypi;linux-raspberrypi2;linux-colibri-vf">
<description>
-Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick 2.
+Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick.
</description>
</application>
-<application title="Graphical Effects" location="/data/user/qt/graphicaleffects" main="main.qml" icon="/data/user/qt/graphicaleffects/preview_l.jpg" exclude="linux-beaglebone;android-beaglebone;linux-colibri-vf">
+<application title="Graphical Effects" location="/data/user/qt/graphicaleffects" main="main.qml" icon="/data/user/qt/graphicaleffects/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf">
<description>
-This example shows the Qt Quick 2.0 ShaderEffect type and the Qt Graphical Effects module. Qt Quick 2.0 provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects.
+This example shows the Qt Quick ShaderEffect type and the Qt Graphical Effects module. Qt Quick provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects.
-However, as UIs typically reuse many of the same effects, the Qt Graphical Effects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks and more.
+However, as UIs typically reuse many of the same effects, the Qt Graphical Effects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks, and more.
</description>
</application>
-<application title="Media Player" location="/data/user/qt/mediaplayer" main="main.qml" icon="/data/user/qt/mediaplayer/preview_l.jpg" exclude="android-beaglebone;android-emulator;linux-beaglebone;linux-colibri-vf">
+<application title="Media Player" location="/data/user/qt/mediaplayer" main="main.qml" icon="/data/user/qt/mediaplayer/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf">
<description>
The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick.
@@ -65,15 +65,15 @@ It can play content either from a file or a network source, both videos and musi
<application title="Qt5 Cinematic Demo" location="/data/user/qt/qt5-cinematicdemo" main="main.qml" icon="/data/user/qt/qt5-cinematicdemo/preview_l.jpg">
<description>
-The Qt5 Cinematic Experience is a demo by "QUIt Coding".
+The Qt 5 Cinematic Experience is a demo by "QUIt Coding".
-The demo shows off a number features of Qt Quick 2.0. A nicely styled list control of movie covers with lighting effects, particles and transitions. The information roll-down curvy curtain is implemented using inline GLSL in the QML file. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com.
+The demo shows off a number features of Qt Quick. A nicely styled list control of movie covers with lighting effects, particles and transitions. The information roll-down curvy curtain is implemented using inline GLSL in the QML file. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com.
</description>
</application>
<application title="Web Browser" location="/data/user/qt/qtwebbrowser" main="main.qml" icon="/data/user/qt/qtwebbrowser/preview_l.jpg" exclude="linux-emulator;linux-raspberrypi;linux-beaglebone;linux-colibri-vf">
<description>
-This example demonstrates the use of the QtWebEngine WebView with Qt Quick.
+This example demonstrates the use of Qt WebEngine with Qt Quick.
Demo can be used to browse the internet (working network connection required) or run the offline web page demos.
</description>
@@ -83,7 +83,7 @@ Demo can be used to browse the internet (working network connection required) or
<description>
This example illustrates how to handle input on touch devices.
-Qt Enterprise Embedded comes with Qt Virtual Keyboard - a framework that consists of a C++ backend with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages.
+Qt for Device Creation comes with Qt Virtual Keyboard - a framework that consists of a C++ backend with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages.
</description>
</application>
diff --git a/basicsuite/qtwebbrowser/app.pro b/basicsuite/qtwebbrowser/app.pro
new file mode 100644
index 0000000..eda1be9
--- /dev/null
+++ b/basicsuite/qtwebbrowser/app.pro
@@ -0,0 +1,13 @@
+TARGET = qtwebbrowser
+
+include(../shared/shared.pri)
+b2qtdemo_deploy_defaults()
+
+content.files = \
+ *.qml \
+ *.png
+content.path = $$DESTPATH
+
+OTHER_FILES += $${content.files}
+
+INSTALLS += target content
diff --git a/basicsuite/qtwebbrowser/lib.pro b/basicsuite/qtwebbrowser/lib.pro
new file mode 100644
index 0000000..16152f2
--- /dev/null
+++ b/basicsuite/qtwebbrowser/lib.pro
@@ -0,0 +1,29 @@
+TEMPLATE = lib
+TARGET = webbrowser
+QT += qml quick
+CONFIG += qt plugin
+
+INCLUDEPATH += tqtc-qtwebbrowser/src
+
+HEADERS += \
+ tqtc-qtwebbrowser/src/appengine.h \
+ tqtc-qtwebbrowser/src/touchtracker.h \
+ tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h
+
+SOURCES += \
+ plugin.cpp \
+ tqtc-qtwebbrowser/src/appengine.cpp \
+ tqtc-qtwebbrowser/src/touchtracker.cpp \
+ tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp
+
+pluginfiles.files += \
+ qmldir
+
+RESOURCES += tqtc-qtwebbrowser/src/resources.qrc
+
+B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser
+
+target.path = $$B2QT_DEPLOYPATH
+pluginfiles.path = $$B2QT_DEPLOYPATH
+
+INSTALLS += target pluginfiles
diff --git a/basicsuite/qtwebbrowser/main.qml b/basicsuite/qtwebbrowser/main.qml
index dcca154..c0f795c 100644
--- a/basicsuite/qtwebbrowser/main.qml
+++ b/basicsuite/qtwebbrowser/main.qml
@@ -1,5 +1,6 @@
import QtQuick 2.0
+import WebBrowser 1.0
Loader {
- source: "tqtc-qtwebbrowser/src/qml/BrowserWindow.qml"
+ source: "qrc:/qml/BrowserWindow.qml"
}
diff --git a/basicsuite/qtwebbrowser/qtwebbrowser.pro b/basicsuite/qtwebbrowser/qtwebbrowser.pro
index 8532344..dc2f809 100644
--- a/basicsuite/qtwebbrowser/qtwebbrowser.pro
+++ b/basicsuite/qtwebbrowser/qtwebbrowser.pro
@@ -1,27 +1,4 @@
-TEMPLATE = lib
-TARGET = webbrowser
-QT += qml quick
-CONFIG += qt plugin
-
-INCLUDEPATH += tqtc-qtwebbrowser/src
-
-HEADERS += \
- tqtc-qtwebbrowser/src/appengine.h \
- tqtc-qtwebbrowser/src/touchtracker.h \
- tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h
-
-SOURCES += \
- plugin.cpp \
- tqtc-qtwebbrowser/src/appengine.cpp \
- tqtc-qtwebbrowser/src/touchtracker.cpp \
- tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp
-
-pluginfiles.files += \
- qmldir
-
-B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser
-
-target.path = $$B2QT_DEPLOYPATH
-pluginfiles.path = $$B2QT_DEPLOYPATH
-
-INSTALLS += target pluginfiles
+TEMPLATE = subdirs
+SUBDIRS += \
+ lib.pro \
+ app.pro
diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro
index f3e31de..99b6f93 100644
--- a/wayland/democompositor/democompositor.pro
+++ b/wayland/democompositor/democompositor.pro
@@ -17,3 +17,5 @@ RESOURCES += democompositor.qrc
HEADERS += \
processlauncher.h
+INSTALLS += target
+target.path = /data/user/$$TARGET
diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc
index e4fcc75..940f04e 100644
--- a/wayland/democompositor/democompositor.qrc
+++ b/wayland/democompositor/democompositor.qrc
@@ -6,15 +6,15 @@
<file>qml/MyButton.qml</file>
<file>qml/LaunchButton.qml</file>
<file>qml/TimedButton.qml</file>
- <file>images/icon1.png</file>
- <file>images/icon2.png</file>
- <file>images/icon3.png</file>
- <file>images/icon4.png</file>
<file>images/quit.png</file>
<file>images/greendot.png</file>
<file>images/reddot.png</file>
<file>images/graydot.png</file>
<file>images/graydots.png</file>
<file>images/greendots.png</file>
+ <file>images/Icon_Clocks.png</file>
+ <file>images/Icon_Maps.png</file>
+ <file>images/Icon_RSS.png</file>
+ <file>images/Icon_StocQt.png</file>
</qresource>
</RCC>
diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/images/Icon_Clocks.png
new file mode 100644
index 0000000..0ca1955
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Clocks.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/images/Icon_Maps.png
new file mode 100644
index 0000000..fac0dc9
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Maps.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/images/Icon_RSS.png
new file mode 100644
index 0000000..54ada4f
--- /dev/null
+++ b/wayland/democompositor/images/Icon_RSS.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/images/Icon_StocQt.png
new file mode 100644
index 0000000..d12aec1
--- /dev/null
+++ b/wayland/democompositor/images/Icon_StocQt.png
Binary files differ
diff --git a/wayland/democompositor/qml/MyButton.qml b/wayland/democompositor/qml/MyButton.qml
index c8397a6..30d7236 100644
--- a/wayland/democompositor/qml/MyButton.qml
+++ b/wayland/democompositor/qml/MyButton.qml
@@ -118,8 +118,6 @@ Item {
rect.anchors.right = parent.right
parent.longPressed = false
}
- onEntered: console.log("Enter: " + buttonText.text)
- onExited: console.log("Exit: " + buttonText.text)
drag.target: rect
drag.threshold: 5
drag.axis: Drag.XAxis
diff --git a/wayland/democompositor/qml/Screen.qml b/wayland/democompositor/qml/Screen.qml
index 2064480..48abd19 100644
--- a/wayland/democompositor/qml/Screen.qml
+++ b/wayland/democompositor/qml/Screen.qml
@@ -246,7 +246,7 @@ WaylandOutput {
textColor: textCol
text.text: "Clocks"
executable: "./clocks"
- icon.source: "qrc:/images/icon1.png"
+ icon.source: "qrc:/images/Icon_Clocks.png"
}
LaunchButton {
@@ -257,7 +257,7 @@ WaylandOutput {
textColor: textCol
text.text: "RSS News"
executable: "./rssnews"
- icon.source: "qrc:/images/icon2.png"
+ icon.source: "qrc:/images/Icon_RSS.png"
}
LaunchButton {
height: 60
@@ -267,7 +267,7 @@ WaylandOutput {
textColor: textCol
text.text: "StoQt"
executable: "./stocqt"
- icon.source: "qrc:/images/icon3.png"
+ icon.source: "qrc:/images/Icon_StocQt.png"
}
LaunchButton {
height: 60
@@ -277,7 +277,7 @@ WaylandOutput {
textColor: textCol
text.text: "Maps"
executable: "./qml_location_mapviewer"
- icon.source: "qrc:/images/icon4.png"
+ icon.source: "qrc:/images/Icon_Maps.png"
}
TimedButton {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:36:37 +0000