diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:11:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:12:23 +0100 |
| commit | f596553e03c3969f6e7cb5344c05591da6e70dfb (patch) | |
| tree | 8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c /tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro | |
| parent | e32845b137834ef46d68345a0029d4af7c1d85bb (diff) | |
| parent | 7030adff1869e850a7b983e88d7a773d5d594886 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
Diffstat (limited to 'tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro')
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro index b2b325dc72..a83927e720 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro +++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro @@ -14,4 +14,5 @@ QT += core qml testlib gui-private DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 OTHER_FILES += \ - data/pixmapCacheTest.qml + data/pixmapCacheTest.qml \ + data/controlFromJS.qml |