diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-18 20:38:18 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-20 19:56:29 +0200 |
| commit | a99380b155bf679e240e4d01b70691feebad0d4c (patch) | |
| tree | 35255bd1dcd86ced22c02c3f54219ab5eada8648 | |
| parent | d9b0bc144676a5a984ee2f1443419336cf258c94 (diff) | |
| download | qtquickcontrols-a99380b155bf679e240e4d01b70691feebad0d4c.tar.gz | |
Remove unused BasicButton::__textColor
Gets rid of an extra SystemPalette instance that installs
an event filter on the application object.
Change-Id: Ib7e1fd5634084a2b949bb5b7146fabe89f05be38
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| -rw-r--r-- | src/controls/Private/BasicButton.qml | 4 | ||||
| -rw-r--r-- | src/controls/plugins.qmltypes | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 849315e9..f482ad72 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -126,8 +126,6 @@ Control { property string iconName: action ? action.iconName : "" /*! \internal */ - property color __textColor: syspal.text - /*! \internal */ property string __position: "only" /*! \internal */ readonly property bool __iconOverriden: button.action && (button.action.iconSource !== button.iconSource || button.action.iconName !== button.iconName) @@ -218,8 +216,6 @@ Control { /*! \internal */ property bool __effectivePressed: behavior.effectivePressed - SystemPalette { id: syspal } - states: [ State { name: "boundAction" diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes index a9d6e527..d1a56b89 100644 --- a/src/controls/plugins.qmltypes +++ b/src/controls/plugins.qmltypes @@ -1201,7 +1201,6 @@ Module { Property { name: "tooltip"; type: "string" } Property { name: "iconSource"; type: "QUrl" } Property { name: "iconName"; type: "string" } - Property { name: "__textColor"; type: "QColor" } Property { name: "__position"; type: "string" } Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } Property { name: "__action"; type: "QQuickAction"; isPointer: true } @@ -2182,7 +2181,6 @@ Module { Property { name: "tooltip"; type: "string" } Property { name: "iconSource"; type: "QUrl" } Property { name: "iconName"; type: "string" } - Property { name: "__textColor"; type: "QColor" } Property { name: "__position"; type: "string" } Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } Property { name: "__action"; type: "QQuickAction"; isPointer: true } |