diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-03-01 09:44:00 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-03-01 09:44:00 +0100 |
| commit | 1f940786fbd1e99441b91e071c242858e7439da2 (patch) | |
| tree | 6798473a995e42ee43f04d04ee57be52daffddb7 /share | |
| parent | 20d21db2d0604bd8198b338edf68789c9599e59c (diff) | |
| parent | c7f7585bda4a557c88a08cfca78b903b03eb70cc (diff) | |
| download | qt-creator-1f940786fbd1e99441b91e071c242858e7439da2.tar.gz | |
Merge branch 'qml_renaming'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml index 508711314b..a043c9429e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml @@ -15,7 +15,7 @@ QFrame { opacity: Behavior { NumberAnimation { - easing: "easeInSine" + easing.type: "InSine" duration: 200 } } |