aboutsummaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorAlan Alpert <416365416c@gmail.com>2012-11-19 19:01:50 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-21 16:49:23 +0100
commit69cc8cd7acf36f1d1f73e6e30d7162bfe59c364e (patch)
treeb9e6fb3c4080006933572ec0f7c84979e2b61faa /tools/tools.pro
parente03e870b7b4aac85e85b56655ccbc5d99c91053f (diff)
Unify qmleasing and easingcurveeditor
Keeping the name qmleasing, but most of the code from easingcurveeditor. easingcurveeditor had more UI and functionality, as qmleasing could only import AfterEffects curves. That functionality has now been added to easingcurveeditor. Change-Id: Iac1a004f13fe33a18449af1b08bd22138d525322 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 396641193f..abb246f0fe 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -3,10 +3,9 @@ SUBDIRS += \
qmlscene \
qmlplugindump \
qmlmin \
- qmleasing \
qmlprofiler \
qmlbundle \
qmltestrunner
-!contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor
+!contains(QT_CONFIG, no-widgets):SUBDIRS += qmleasing