summaryrefslogtreecommitdiff
path: root/examples/quick
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-08-20 15:19:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-27 11:32:05 +0200
commita75ec2e52db71df33ea0ced041dcec8be1b04f24 (patch)
tree915651a714eedf288813e4c321918c247ca1c1e5 /examples/quick
parentcad1a84529d8a6756c5ca37c1f9fcd691f8c817a (diff)
downloadqtquickcontrols-a75ec2e52db71df33ea0ced041dcec8be1b04f24.tar.gz
Example: Rename Text example to TextEditor
Text is too generic. Change-Id: I68d304345d2982a8acc8843c4c843e9f5e696954 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/controls/controls.pro2
-rw-r--r--examples/quick/controls/texteditor/example.html (renamed from examples/quick/controls/text/example.html)0
-rw-r--r--examples/quick/controls/texteditor/qml/ToolBarSeparator.qml (renamed from examples/quick/controls/text/qml/ToolBarSeparator.qml)0
-rw-r--r--examples/quick/controls/texteditor/qml/images/editcopy.png (renamed from examples/quick/controls/text/qml/images/editcopy.png)bin1468 -> 1468 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/editcut.png (renamed from examples/quick/controls/text/qml/images/editcut.png)bin1512 -> 1512 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/editpaste.png (renamed from examples/quick/controls/text/qml/images/editpaste.png)bin1906 -> 1906 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/editredo.png (renamed from examples/quick/controls/text/qml/images/editredo.png)bin1752 -> 1752 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/editundo.png (renamed from examples/quick/controls/text/qml/images/editundo.png)bin1746 -> 1746 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/exportpdf.png (renamed from examples/quick/controls/text/qml/images/exportpdf.png)bin1215 -> 1215 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/filenew.png (renamed from examples/quick/controls/text/qml/images/filenew.png)bin1172 -> 1172 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/fileopen.png (renamed from examples/quick/controls/text/qml/images/fileopen.png)bin2168 -> 2168 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/fileprint.png (renamed from examples/quick/controls/text/qml/images/fileprint.png)bin2087 -> 2087 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/filesave.png (renamed from examples/quick/controls/text/qml/images/filesave.png)bin1206 -> 1206 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/qt-logo.png (renamed from examples/quick/controls/text/qml/images/qt-logo.png)bin3960 -> 3960 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textbold.png (renamed from examples/quick/controls/text/qml/images/textbold.png)bin1611 -> 1611 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textcenter.png (renamed from examples/quick/controls/text/qml/images/textcenter.png)bin1404 -> 1404 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textitalic.png (renamed from examples/quick/controls/text/qml/images/textitalic.png)bin1164 -> 1164 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textjustify.png (renamed from examples/quick/controls/text/qml/images/textjustify.png)bin1257 -> 1257 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textleft.png (renamed from examples/quick/controls/text/qml/images/textleft.png)bin1235 -> 1235 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textright.png (renamed from examples/quick/controls/text/qml/images/textright.png)bin1406 -> 1406 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/textunder.png (renamed from examples/quick/controls/text/qml/images/textunder.png)bin1183 -> 1183 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/zoomin.png (renamed from examples/quick/controls/text/qml/images/zoomin.png)bin1696 -> 1696 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/images/zoomout.png (renamed from examples/quick/controls/text/qml/images/zoomout.png)bin1662 -> 1662 bytes
-rw-r--r--examples/quick/controls/texteditor/qml/main.qml (renamed from examples/quick/controls/text/qml/main.qml)0
-rw-r--r--examples/quick/controls/texteditor/resources.qrc (renamed from examples/quick/controls/text/resources.qrc)0
-rw-r--r--examples/quick/controls/texteditor/src/documenthandler.cpp (renamed from examples/quick/controls/text/src/documenthandler.cpp)0
-rw-r--r--examples/quick/controls/texteditor/src/documenthandler.h (renamed from examples/quick/controls/text/src/documenthandler.h)0
-rw-r--r--examples/quick/controls/texteditor/src/main.cpp (renamed from examples/quick/controls/text/src/main.cpp)0
-rw-r--r--examples/quick/controls/texteditor/src/src.pri (renamed from examples/quick/controls/text/src/src.pri)0
-rw-r--r--examples/quick/controls/texteditor/texteditor.pro (renamed from examples/quick/controls/text/text.pro)2
30 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
index 405c239e..ad246f1d 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quick/controls/controls.pro
@@ -8,5 +8,5 @@ SUBDIRS += \
basiclayouts
qtHaveModule(widgets) {
- SUBDIRS += text
+ SUBDIRS += texteditor
}
diff --git a/examples/quick/controls/text/example.html b/examples/quick/controls/texteditor/example.html
index 52bb507a..52bb507a 100644
--- a/examples/quick/controls/text/example.html
+++ b/examples/quick/controls/texteditor/example.html
diff --git a/examples/quick/controls/text/qml/ToolBarSeparator.qml b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
index 40a2bc58..40a2bc58 100644
--- a/examples/quick/controls/text/qml/ToolBarSeparator.qml
+++ b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
diff --git a/examples/quick/controls/text/qml/images/editcopy.png b/examples/quick/controls/texteditor/qml/images/editcopy.png
index f5513644..f5513644 100644
--- a/examples/quick/controls/text/qml/images/editcopy.png
+++ b/examples/quick/controls/texteditor/qml/images/editcopy.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/editcut.png b/examples/quick/controls/texteditor/qml/images/editcut.png
index a784fd57..a784fd57 100644
--- a/examples/quick/controls/text/qml/images/editcut.png
+++ b/examples/quick/controls/texteditor/qml/images/editcut.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/editpaste.png b/examples/quick/controls/texteditor/qml/images/editpaste.png
index 64c0b2d6..64c0b2d6 100644
--- a/examples/quick/controls/text/qml/images/editpaste.png
+++ b/examples/quick/controls/texteditor/qml/images/editpaste.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/editredo.png b/examples/quick/controls/texteditor/qml/images/editredo.png
index 8875bf24..8875bf24 100644
--- a/examples/quick/controls/text/qml/images/editredo.png
+++ b/examples/quick/controls/texteditor/qml/images/editredo.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/editundo.png b/examples/quick/controls/texteditor/qml/images/editundo.png
index a3bd5e0b..a3bd5e0b 100644
--- a/examples/quick/controls/text/qml/images/editundo.png
+++ b/examples/quick/controls/texteditor/qml/images/editundo.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/exportpdf.png b/examples/quick/controls/texteditor/qml/images/exportpdf.png
index ebb44e6b..ebb44e6b 100644
--- a/examples/quick/controls/text/qml/images/exportpdf.png
+++ b/examples/quick/controls/texteditor/qml/images/exportpdf.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/filenew.png b/examples/quick/controls/texteditor/qml/images/filenew.png
index d3882c7b..d3882c7b 100644
--- a/examples/quick/controls/text/qml/images/filenew.png
+++ b/examples/quick/controls/texteditor/qml/images/filenew.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/fileopen.png b/examples/quick/controls/texteditor/qml/images/fileopen.png
index fc06c5ec..fc06c5ec 100644
--- a/examples/quick/controls/text/qml/images/fileopen.png
+++ b/examples/quick/controls/texteditor/qml/images/fileopen.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/fileprint.png b/examples/quick/controls/texteditor/qml/images/fileprint.png
index 10ca56c8..10ca56c8 100644
--- a/examples/quick/controls/text/qml/images/fileprint.png
+++ b/examples/quick/controls/texteditor/qml/images/fileprint.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/filesave.png b/examples/quick/controls/texteditor/qml/images/filesave.png
index b41ecf53..b41ecf53 100644
--- a/examples/quick/controls/text/qml/images/filesave.png
+++ b/examples/quick/controls/texteditor/qml/images/filesave.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/qt-logo.png b/examples/quick/controls/texteditor/qml/images/qt-logo.png
index 6dedc8bf..6dedc8bf 100644
--- a/examples/quick/controls/text/qml/images/qt-logo.png
+++ b/examples/quick/controls/texteditor/qml/images/qt-logo.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textbold.png b/examples/quick/controls/texteditor/qml/images/textbold.png
index 38400bd1..38400bd1 100644
--- a/examples/quick/controls/text/qml/images/textbold.png
+++ b/examples/quick/controls/texteditor/qml/images/textbold.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textcenter.png b/examples/quick/controls/texteditor/qml/images/textcenter.png
index 2ef5b2ee..2ef5b2ee 100644
--- a/examples/quick/controls/text/qml/images/textcenter.png
+++ b/examples/quick/controls/texteditor/qml/images/textcenter.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textitalic.png b/examples/quick/controls/texteditor/qml/images/textitalic.png
index 0170ee26..0170ee26 100644
--- a/examples/quick/controls/text/qml/images/textitalic.png
+++ b/examples/quick/controls/texteditor/qml/images/textitalic.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textjustify.png b/examples/quick/controls/texteditor/qml/images/textjustify.png
index 39cd6c1a..39cd6c1a 100644
--- a/examples/quick/controls/text/qml/images/textjustify.png
+++ b/examples/quick/controls/texteditor/qml/images/textjustify.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textleft.png b/examples/quick/controls/texteditor/qml/images/textleft.png
index 83a66d55..83a66d55 100644
--- a/examples/quick/controls/text/qml/images/textleft.png
+++ b/examples/quick/controls/texteditor/qml/images/textleft.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textright.png b/examples/quick/controls/texteditor/qml/images/textright.png
index e7c04645..e7c04645 100644
--- a/examples/quick/controls/text/qml/images/textright.png
+++ b/examples/quick/controls/texteditor/qml/images/textright.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/textunder.png b/examples/quick/controls/texteditor/qml/images/textunder.png
index 968bac5e..968bac5e 100644
--- a/examples/quick/controls/text/qml/images/textunder.png
+++ b/examples/quick/controls/texteditor/qml/images/textunder.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/zoomin.png b/examples/quick/controls/texteditor/qml/images/zoomin.png
index d46f5aff..d46f5aff 100644
--- a/examples/quick/controls/text/qml/images/zoomin.png
+++ b/examples/quick/controls/texteditor/qml/images/zoomin.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/images/zoomout.png b/examples/quick/controls/texteditor/qml/images/zoomout.png
index 46326566..46326566 100644
--- a/examples/quick/controls/text/qml/images/zoomout.png
+++ b/examples/quick/controls/texteditor/qml/images/zoomout.png
Binary files differ
diff --git a/examples/quick/controls/text/qml/main.qml b/examples/quick/controls/texteditor/qml/main.qml
index 0d7ede25..0d7ede25 100644
--- a/examples/quick/controls/text/qml/main.qml
+++ b/examples/quick/controls/texteditor/qml/main.qml
diff --git a/examples/quick/controls/text/resources.qrc b/examples/quick/controls/texteditor/resources.qrc
index 27c7b921..27c7b921 100644
--- a/examples/quick/controls/text/resources.qrc
+++ b/examples/quick/controls/texteditor/resources.qrc
diff --git a/examples/quick/controls/text/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp
index e0c9610d..e0c9610d 100644
--- a/examples/quick/controls/text/src/documenthandler.cpp
+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp
diff --git a/examples/quick/controls/text/src/documenthandler.h b/examples/quick/controls/texteditor/src/documenthandler.h
index a759c403..a759c403 100644
--- a/examples/quick/controls/text/src/documenthandler.h
+++ b/examples/quick/controls/texteditor/src/documenthandler.h
diff --git a/examples/quick/controls/text/src/main.cpp b/examples/quick/controls/texteditor/src/main.cpp
index 8d2b8dd0..8d2b8dd0 100644
--- a/examples/quick/controls/text/src/main.cpp
+++ b/examples/quick/controls/texteditor/src/main.cpp
diff --git a/examples/quick/controls/text/src/src.pri b/examples/quick/controls/texteditor/src/src.pri
index 2b89cd62..2b89cd62 100644
--- a/examples/quick/controls/text/src/src.pri
+++ b/examples/quick/controls/texteditor/src/src.pri
diff --git a/examples/quick/controls/text/text.pro b/examples/quick/controls/texteditor/texteditor.pro
index 864ce0bb..6781f446 100644
--- a/examples/quick/controls/text/text.pro
+++ b/examples/quick/controls/texteditor/texteditor.pro
@@ -1,5 +1,5 @@
QT += qml quick
-TARGET = text
+TARGET = texteditor
qtHaveModule(widgets) {
QT += widgets
}