From 69cc8cd7acf36f1d1f73e6e30d7162bfe59c364e Mon Sep 17 00:00:00 2001
From: Alan Alpert <416365416c@gmail.com>
Date: Mon, 19 Nov 2012 19:01:50 -0800
Subject: 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>
---
 tools/tools.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools/tools.pro')

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
 
 
-- 
cgit v1.2.3