diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-11-11 13:47:59 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-16 00:53:17 +0100 |
commit | e7fb84adb5d5d9cc5c61db3bbd025f206854bcb4 (patch) | |
tree | f5e1d922b8cc0a3ffe01358efdddd15a93867d30 /src/quick/items/items.pri | |
parent | d70cca804e88110eae32f92baff7cee957a6a531 (diff) |
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>
Diffstat (limited to 'src/quick/items/items.pri')
-rw-r--r-- | src/quick/items/items.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index ec1de05b36..85ef591ab9 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -16,7 +16,6 @@ HEADERS += \ $$PWD/qquicktext_p.h \ $$PWD/qquicktext_p_p.h \ $$PWD/qquicktextnode_p.h \ - $$PWD/qquicklinecontrol_p.h \ $$PWD/qquicktextinput_p.h \ $$PWD/qquicktextinput_p_p.h \ $$PWD/qquicktextcontrol_p.h \ @@ -85,7 +84,6 @@ SOURCES += \ $$PWD/qquickpainteditem.cpp \ $$PWD/qquicktext.cpp \ $$PWD/qquicktextnode.cpp \ - $$PWD/qquicklinecontrol.cpp \ $$PWD/qquicktextinput.cpp \ $$PWD/qquicktextcontrol.cpp \ $$PWD/qquicktextedit.cpp \ |