summaryrefslogtreecommitdiffstats
path: root/desktop_devguide/chapter_03/src
diff options
context:
space:
mode:
Diffstat (limited to 'desktop_devguide/chapter_03/src')
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/Marker.qml6
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/MarkerPanel.qml2
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/Note.qml2
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/NoteToolbar.qml4
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/Page.qml2
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/PagePanel.qml4
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/Tool.qml6
-rw-r--r--desktop_devguide/chapter_03/src/notezapp/main.qml4
8 files changed, 15 insertions, 15 deletions
diff --git a/desktop_devguide/chapter_03/src/notezapp/Marker.qml b/desktop_devguide/chapter_03/src/notezapp/Marker.qml
index da267b0..4f95e98 100644
--- a/desktop_devguide/chapter_03/src/notezapp/Marker.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/Marker.qml
@@ -38,9 +38,9 @@
// Marker.qml
-import QtQuick 1.1
+import QtQuick 2.0
-// The Image element as top level is convenient
+// The Image type as top level is convenient
// as the Marker component simply is a graphical
// UI with a clicked() signal.
Image {
@@ -49,7 +49,7 @@ Image {
// declaring the clicked() signal to be used in the MarkerPanel
signal clicked()
- // creating a MouseArea element to intercept the mouse click
+ // creating a MouseArea type to intercept the mouse click
MouseArea {
id: mouseArea
anchors.fill: parent
diff --git a/desktop_devguide/chapter_03/src/notezapp/MarkerPanel.qml b/desktop_devguide/chapter_03/src/notezapp/MarkerPanel.qml
index dd5d1d8..76593eb 100644
--- a/desktop_devguide/chapter_03/src/notezapp/MarkerPanel.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/MarkerPanel.qml
@@ -38,7 +38,7 @@
// MarkerPanel.qml
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: root
diff --git a/desktop_devguide/chapter_03/src/notezapp/Note.qml b/desktop_devguide/chapter_03/src/notezapp/Note.qml
index c71cd38..73d1e12 100644
--- a/desktop_devguide/chapter_03/src/notezapp/Note.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/Note.qml
@@ -38,7 +38,7 @@
// Note.qml
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: root
diff --git a/desktop_devguide/chapter_03/src/notezapp/NoteToolbar.qml b/desktop_devguide/chapter_03/src/notezapp/NoteToolbar.qml
index 369a867..6bda531 100644
--- a/desktop_devguide/chapter_03/src/notezapp/NoteToolbar.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/NoteToolbar.qml
@@ -38,7 +38,7 @@
// NoteToolbar.qml
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: root
@@ -53,7 +53,7 @@ Item {
}
// declaring a property alias to
- // the drag property of MouseArea element
+ // the drag property of MouseArea type
property alias drag: mousearea.drag
// creating a MouseArea item
diff --git a/desktop_devguide/chapter_03/src/notezapp/Page.qml b/desktop_devguide/chapter_03/src/notezapp/Page.qml
index ec0c66a..6d20598 100644
--- a/desktop_devguide/chapter_03/src/notezapp/Page.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/Page.qml
@@ -38,7 +38,7 @@
// Page.qml
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: root
diff --git a/desktop_devguide/chapter_03/src/notezapp/PagePanel.qml b/desktop_devguide/chapter_03/src/notezapp/PagePanel.qml
index cec8aef..1ea9d41 100644
--- a/desktop_devguide/chapter_03/src/notezapp/PagePanel.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/PagePanel.qml
@@ -38,7 +38,7 @@
// PagePane.qml
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: root
@@ -76,7 +76,7 @@ Item {
}
]
- // using a BorderImage element to set
+ // using a BorderImage type to set
// a background for the PagePanel
BorderImage {
id: background
diff --git a/desktop_devguide/chapter_03/src/notezapp/Tool.qml b/desktop_devguide/chapter_03/src/notezapp/Tool.qml
index c2c3270..cd1252b 100644
--- a/desktop_devguide/chapter_03/src/notezapp/Tool.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/Tool.qml
@@ -38,16 +38,16 @@
// Tool.qml
-import QtQuick 1.1
+import QtQuick 2.0
-// Use Image as the top level element
+// Use Image as the top level type
Image {
id: root
// defining the clicked signal
signal clicked()
- // using a MouseArea element to capture
+ // using a MouseArea type to capture
// the mouse click of the user
MouseArea {
anchors.fill: parent
diff --git a/desktop_devguide/chapter_03/src/notezapp/main.qml b/desktop_devguide/chapter_03/src/notezapp/main.qml
index cbbc1be..d1315e7 100644
--- a/desktop_devguide/chapter_03/src/notezapp/main.qml
+++ b/desktop_devguide/chapter_03/src/notezapp/main.qml
@@ -38,7 +38,7 @@
// main.qml
-import QtQuick 1.1
+import QtQuick 2.0
Rectangle {
// using window as the identifier for this item
@@ -93,7 +93,7 @@ Rectangle {
border { color: "#600"; width: 4 }
}
- // using a Column element to layout
+ // using a Column type to layout
// the Tool items vertically
Column {
id: toolbar