Skip to content

Commit

Permalink
Rename TextArea to TextEdit to conform QtQuick.
Browse files Browse the repository at this point in the history
TextArea is still supported and will create a TextEdit, but it's
going to be removed before release.
  • Loading branch information
akreuzkamp committed Jan 11, 2015
1 parent 785965c commit 3fab595
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/qtcore.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
Behavior: QMLBehavior,
TextInput: QMLTextInput,
Button: QMLButton,
TextArea: QMLTextArea,
TextArea: QMLTextEdit, // non-standard, to be removed!
TextEdit: QMLTextEdit,
CheckBox: QMLCheckbox
}

Expand Down Expand Up @@ -3691,7 +3692,7 @@ function QMLButton(meta) {
}
}

function QMLTextArea(meta) {
function QMLTextEdit(meta) {
QMLItem.call(this, meta);

if (engine.renderMode == QMLRenderMode.Canvas) {
Expand Down

0 comments on commit 3fab595

Please sign in to comment.