diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
| commit | 4189a0d294999246f5a9680d348a1d160d4f591c (patch) | |
| tree | f0ca75c7dcee691b5ff98f55991dcdf635d19f4c /tools | |
| parent | bdefc3a2a8f8d91a48f822e2281670d8a6b9efbc (diff) | |
| parent | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (diff) | |
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/easingcurveeditor/easingcurveeditor.pro | 4 | ||||
| -rw-r--r-- | tools/easingcurveeditor/main.cpp | 4 | ||||
| -rw-r--r-- | tools/easingcurveeditor/splineeditor.cpp | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 10 |
4 files changed, 11 insertions, 9 deletions
diff --git a/tools/easingcurveeditor/easingcurveeditor.pro b/tools/easingcurveeditor/easingcurveeditor.pro index 78f2ebf528..91f6516ade 100644 --- a/tools/easingcurveeditor/easingcurveeditor.pro +++ b/tools/easingcurveeditor/easingcurveeditor.pro @@ -1,7 +1,3 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - QT += qml quick widgets CONFIG -= app_bundle diff --git a/tools/easingcurveeditor/main.cpp b/tools/easingcurveeditor/main.cpp index 05e8ace53a..eace1249a7 100644 --- a/tools/easingcurveeditor/main.cpp +++ b/tools/easingcurveeditor/main.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include <QApplication> -#include <mainwindow.h> +#include "mainwindow.h" +#include <QApplication> int main(int argc, char ** argv) { diff --git a/tools/easingcurveeditor/splineeditor.cpp b/tools/easingcurveeditor/splineeditor.cpp index d4408521a8..7216e2acce 100644 --- a/tools/easingcurveeditor/splineeditor.cpp +++ b/tools/easingcurveeditor/splineeditor.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "splineeditor.h" +#include "segmentproperties.h" #include <QPainter> #include <QMouseEvent> #include <QContextMenuEvent> #include <QDebug> #include <QApplication> -#include <segmentproperties.h> const int canvasWidth = 640; const int canvasHeight = 320; diff --git a/tools/tools.pro b/tools/tools.pro index 1ce5667a19..396641193f 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,6 +1,12 @@ TEMPLATE = subdirs -SUBDIRS += qmlscene qmlplugindump qmlmin qmleasing qmlprofiler qmlbundle +SUBDIRS += \ + qmlscene \ + qmlplugindump \ + qmlmin \ + qmleasing \ + qmlprofiler \ + qmlbundle \ + qmltestrunner !contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor -contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner |