summaryrefslogtreecommitdiffstats
path: root/examples/tutorials
diff options
context:
space:
mode:
Diffstat (limited to 'examples/tutorials')
-rw-r--r--examples/tutorials/gettingStarted/gsQml/texteditor.qml4
-rwxr-xr-xexamples/tutorials/modelview/3_changingmodel/mymodel.cpp3
-rwxr-xr-xexamples/tutorials/modelview/5_edit/mainwindow.h6
-rwxr-xr-xexamples/tutorials/modelview/6_treeview/mainwindow.h8
-rwxr-xr-xexamples/tutorials/modelview/7_selections/mainwindow.h8
5 files changed, 22 insertions, 7 deletions
diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
index 3bd9d55..5a75e0b 100644
--- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml
+++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
@@ -100,6 +100,7 @@ Rectangle {
}
}
+//! [states]
states:[
State {
name: "DRAWER_OPEN"
@@ -116,7 +117,9 @@ Rectangle {
PropertyChanges { target: arrowIcon; rotation: 0 }
}
]
+//! [states]
+//! [transitions]
transitions: [
Transition {
to: "*"
@@ -125,4 +128,5 @@ Rectangle {
NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo }
}
]
+//! [transitions]
}
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
index 42915b0..7d78aa7 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
@@ -38,9 +38,8 @@
**
****************************************************************************/
-#include <QTimer>
-#include <QTime>
#include <QBrush>
+#include <QTime>
#include "mymodel.h"
//! [quoting mymodel_a]
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index ac5b77b..41b15d1 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,7 +42,11 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTableView>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTableView; //forward declaration
+QT_END_NAMESPACE
+
class MainWindow : public QMainWindow
{
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index 4c4ddb0..16d3140 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,8 +42,12 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QStandardItem;
+QT_END_NAMESPACE
class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index a8f8488..0d2dd0e 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,8 +42,12 @@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QItemSelection;
+QT_END_NAMESPACE
class MainWindow : public QMainWindow