summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-28 07:12:08 (GMT)
committeraxis <qt-info@nokia.com>2009-08-28 07:12:08 (GMT)
commit1d5d0ea68cba0184d4d0efebb7fa9122d9495614 (patch)
tree2f11cc1ab4ee5c314424e73cddd2733629934f6a /demos
parent1e982527668ea168f12875fda4ecc56ae017d7b3 (diff)
parent813b040339b965ce31a0e7115fdee50d1d9e7ffd (diff)
downloadQt-1d5d0ea68cba0184d4d0efebb7fa9122d9495614.zip
Qt-1d5d0ea68cba0184d4d0efebb7fa9122d9495614.tar.gz
Qt-1d5d0ea68cba0184d4d0efebb7fa9122d9495614.tar.bz2
Merge branch 'inputPanelExample' into 4.6
Diffstat (limited to 'demos')
-rw-r--r--demos/qtdemo/xml/examples.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 6c8ddb0..f598780 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -196,6 +196,7 @@
<example filename="completer" name="Completer" />
<example filename="customcompleter" name="Custom Completer" />
<example filename="i18n" name="Internationalization" />
+ <example filename="inputpanel" name="Input Panel" />
<example filename="plugandpaint" name="Plug and Paint" />
<example filename="regexp" name="Regular Expressions" />
<example filename="settingseditor" name="Settings Editor" />