aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@viroteck.net>2016-03-11 09:45:26 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-15 08:20:36 +0000
commitc19590f72012168f4e6ea1a3f7e55cb080919a34 (patch)
treeb254b4c7f18c7728c5c87bf6043ac57ddaefa9dc
parent4c065b497e63832cf610cc06d67a7b40965154fb (diff)
Move qmltime out of benchmarks directory.
This is a tool, not a benchmark. Change-Id: Ie6b4452a1235923e1663a8a525ddad8408d21545 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--tests/benchmarks/qml/qml.pro1
-rw-r--r--tools/qmltime/example.qml (renamed from tests/benchmarks/qml/qmltime/example.qml)0
-rw-r--r--tools/qmltime/linelaidout.qml (renamed from tests/benchmarks/qml/qmltime/linelaidout.qml)0
-rw-r--r--tools/qmltime/qmltime.cpp (renamed from tests/benchmarks/qml/qmltime/qmltime.cpp)0
-rw-r--r--tools/qmltime/qmltime.pro (renamed from tests/benchmarks/qml/qmltime/qmltime.pro)0
-rw-r--r--tools/qmltime/tests/anchors/empty.qml (renamed from tests/benchmarks/qml/qmltime/tests/anchors/empty.qml)0
-rw-r--r--tools/qmltime/tests/anchors/fill.qml (renamed from tests/benchmarks/qml/qmltime/tests/anchors/fill.qml)0
-rw-r--r--tools/qmltime/tests/anchors/null.qml (renamed from tests/benchmarks/qml/qmltime/tests/anchors/null.qml)0
-rw-r--r--tools/qmltime/tests/animation/large.qml (renamed from tests/benchmarks/qml/qmltime/tests/animation/large.qml)0
-rw-r--r--tools/qmltime/tests/animation/largeNoProps.qml (renamed from tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml)0
-rw-r--r--tools/qmltime/tests/item_creation/children.qml (renamed from tests/benchmarks/qml/qmltime/tests/item_creation/children.qml)0
-rw-r--r--tools/qmltime/tests/item_creation/data.qml (renamed from tests/benchmarks/qml/qmltime/tests/item_creation/data.qml)0
-rw-r--r--tools/qmltime/tests/item_creation/no_creation.qml (renamed from tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml)0
-rw-r--r--tools/qmltime/tests/item_creation/resources.qml (renamed from tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml)0
-rw-r--r--tools/qmltime/tests/loader/Loaded.qml (renamed from tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml)0
-rw-r--r--tools/qmltime/tests/loader/component_loader.qml (renamed from tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml)0
-rw-r--r--tools/qmltime/tests/loader/empty_loader.qml (renamed from tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml)0
-rw-r--r--tools/qmltime/tests/loader/no_loader.qml (renamed from tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml)0
-rw-r--r--tools/qmltime/tests/loader/source_loader.qml (renamed from tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml)0
-rw-r--r--tools/qmltime/tests/positioner_creation/no_positioner.qml (renamed from tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml)0
-rw-r--r--tools/qmltime/tests/positioner_creation/null_positioner.qml (renamed from tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml)0
-rw-r--r--tools/qmltime/tests/positioner_creation/positioner.qml (renamed from tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml)0
-rw-r--r--tools/qmltime/tests/vmemetaobject/null.qml (renamed from tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml)0
-rw-r--r--tools/qmltime/tests/vmemetaobject/property.qml (renamed from tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml)0
-rw-r--r--tools/qmltime/textingrid.qml (renamed from tests/benchmarks/qml/qmltime/textingrid.qml)0
-rw-r--r--tools/tools.pro7
26 files changed, 6 insertions, 2 deletions
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 9c7583cd3b..b80ead6072 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -11,7 +11,6 @@ SUBDIRS += \
qqmlimage \
qqmlmetaproperty \
# script \ ### FIXME: doesn't build
- qmltime \
js \
qquickwindow
diff --git a/tests/benchmarks/qml/qmltime/example.qml b/tools/qmltime/example.qml
index 3ef15d7567..3ef15d7567 100644
--- a/tests/benchmarks/qml/qmltime/example.qml
+++ b/tools/qmltime/example.qml
diff --git a/tests/benchmarks/qml/qmltime/linelaidout.qml b/tools/qmltime/linelaidout.qml
index 90b7d14253..90b7d14253 100644
--- a/tests/benchmarks/qml/qmltime/linelaidout.qml
+++ b/tools/qmltime/linelaidout.qml
diff --git a/tests/benchmarks/qml/qmltime/qmltime.cpp b/tools/qmltime/qmltime.cpp
index 2abe71fb4c..2abe71fb4c 100644
--- a/tests/benchmarks/qml/qmltime/qmltime.cpp
+++ b/tools/qmltime/qmltime.cpp
diff --git a/tests/benchmarks/qml/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro
index fa93e91af0..fa93e91af0 100644
--- a/tests/benchmarks/qml/qmltime/qmltime.pro
+++ b/tools/qmltime/qmltime.pro
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml b/tools/qmltime/tests/anchors/empty.qml
index 309b4caa7e..309b4caa7e 100644
--- a/tests/benchmarks/qml/qmltime/tests/anchors/empty.qml
+++ b/tools/qmltime/tests/anchors/empty.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml b/tools/qmltime/tests/anchors/fill.qml
index df32da66e5..df32da66e5 100644
--- a/tests/benchmarks/qml/qmltime/tests/anchors/fill.qml
+++ b/tools/qmltime/tests/anchors/fill.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/anchors/null.qml b/tools/qmltime/tests/anchors/null.qml
index 8a1ae0c25d..8a1ae0c25d 100644
--- a/tests/benchmarks/qml/qmltime/tests/anchors/null.qml
+++ b/tools/qmltime/tests/anchors/null.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/animation/large.qml b/tools/qmltime/tests/animation/large.qml
index 0c791961dd..0c791961dd 100644
--- a/tests/benchmarks/qml/qmltime/tests/animation/large.qml
+++ b/tools/qmltime/tests/animation/large.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml b/tools/qmltime/tests/animation/largeNoProps.qml
index 734ee46b77..734ee46b77 100644
--- a/tests/benchmarks/qml/qmltime/tests/animation/largeNoProps.qml
+++ b/tools/qmltime/tests/animation/largeNoProps.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml b/tools/qmltime/tests/item_creation/children.qml
index 87085c1134..87085c1134 100644
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/children.qml
+++ b/tools/qmltime/tests/item_creation/children.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml b/tools/qmltime/tests/item_creation/data.qml
index 96804fda40..96804fda40 100644
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/data.qml
+++ b/tools/qmltime/tests/item_creation/data.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml b/tools/qmltime/tests/item_creation/no_creation.qml
index 64561eb211..64561eb211 100644
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/no_creation.qml
+++ b/tools/qmltime/tests/item_creation/no_creation.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml b/tools/qmltime/tests/item_creation/resources.qml
index c896666b9a..c896666b9a 100644
--- a/tests/benchmarks/qml/qmltime/tests/item_creation/resources.qml
+++ b/tools/qmltime/tests/item_creation/resources.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml b/tools/qmltime/tests/loader/Loaded.qml
index 8dedef1361..8dedef1361 100644
--- a/tests/benchmarks/qml/qmltime/tests/loader/Loaded.qml
+++ b/tools/qmltime/tests/loader/Loaded.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml b/tools/qmltime/tests/loader/component_loader.qml
index 9c245aeb21..9c245aeb21 100644
--- a/tests/benchmarks/qml/qmltime/tests/loader/component_loader.qml
+++ b/tools/qmltime/tests/loader/component_loader.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml b/tools/qmltime/tests/loader/empty_loader.qml
index 9f288f8ad5..9f288f8ad5 100644
--- a/tests/benchmarks/qml/qmltime/tests/loader/empty_loader.qml
+++ b/tools/qmltime/tests/loader/empty_loader.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml b/tools/qmltime/tests/loader/no_loader.qml
index c84b9d3dd6..c84b9d3dd6 100644
--- a/tests/benchmarks/qml/qmltime/tests/loader/no_loader.qml
+++ b/tools/qmltime/tests/loader/no_loader.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml b/tools/qmltime/tests/loader/source_loader.qml
index 41a1792d2c..41a1792d2c 100644
--- a/tests/benchmarks/qml/qmltime/tests/loader/source_loader.qml
+++ b/tools/qmltime/tests/loader/source_loader.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml b/tools/qmltime/tests/positioner_creation/no_positioner.qml
index 09a3fb4321..09a3fb4321 100644
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/no_positioner.qml
+++ b/tools/qmltime/tests/positioner_creation/no_positioner.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml b/tools/qmltime/tests/positioner_creation/null_positioner.qml
index 957688bcee..957688bcee 100644
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/null_positioner.qml
+++ b/tools/qmltime/tests/positioner_creation/null_positioner.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml b/tools/qmltime/tests/positioner_creation/positioner.qml
index 4e6f08a1fe..4e6f08a1fe 100644
--- a/tests/benchmarks/qml/qmltime/tests/positioner_creation/positioner.qml
+++ b/tools/qmltime/tests/positioner_creation/positioner.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml b/tools/qmltime/tests/vmemetaobject/null.qml
index f695c989a3..f695c989a3 100644
--- a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/null.qml
+++ b/tools/qmltime/tests/vmemetaobject/null.qml
diff --git a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml b/tools/qmltime/tests/vmemetaobject/property.qml
index f0ccabe2f0..f0ccabe2f0 100644
--- a/tests/benchmarks/qml/qmltime/tests/vmemetaobject/property.qml
+++ b/tools/qmltime/tests/vmemetaobject/property.qml
diff --git a/tests/benchmarks/qml/qmltime/textingrid.qml b/tools/qmltime/textingrid.qml
index 69dbdb5dd6..69dbdb5dd6 100644
--- a/tests/benchmarks/qml/qmltime/textingrid.qml
+++ b/tools/qmltime/textingrid.qml
diff --git a/tools/tools.pro b/tools/tools.pro
index b2e9e27066..96cf80405a 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -12,7 +12,12 @@ qmlimportscanner.CONFIG = host_build
qmlprofiler \
qmllint
qtHaveModule(quick) {
- !static: SUBDIRS += qmlscene qmlplugindump
+ !static: {
+ SUBDIRS += \
+ qmlscene \
+ qmlplugindump \
+ qmltime
+ }
qtHaveModule(widgets): SUBDIRS += qmleasing
}
qtHaveModule(qmltest): SUBDIRS += qmltestrunner