Merge QQuickLineControl into QQuickTextInput.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Fri, 11 Nov 2011 03:47:59 +0000 (13:47 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Dec 2011 23:53:17 +0000 (00:53 +0100)
commite7fb84adb5d5d9cc5c61db3bbd025f206854bcb4
treef5e1d922b8cc0a3ffe01358efdddd15a93867d30
parentd70cca804e88110eae32f92baff7cee957a6a531
Merge QQuickLineControl into QQuickTextInput.

There's no clear separation of responsibilty between these classes and
keeping them in sync and forwarding signals is a unnecessary overhead
that can be avoided by combining them.

Task-number: QTBUG-22627
Change-Id: I4350eb3c612b10d4ed34886374889ae893b8183a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
src/quick/items/items.pri
src/quick/items/qquicklinecontrol.cpp [deleted file]
src/quick/items/qquicklinecontrol_p.h [deleted file]
src/quick/items/qquicktextinput.cpp
src/quick/items/qquicktextinput_p.h
src/quick/items/qquicktextinput_p_p.h
tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp