diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-09 14:32:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-09 14:32:32 +0100 |
| commit | e3f7da72ac5b4540f88bb5cbd91a4917ba84334a (patch) | |
| tree | 3f05c1cf965fe291685c383f04b0bec87b05095b /src/qmltest | |
| parent | 4cc883452b37dbe3148064150dc2f6b282b6b816 (diff) | |
| parent | 2e8a45d99f94cbd2c805dd3de56d60d9baa9bd4e (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/qml/memory/qv4mm.cpp
src/qml/qml/qqmlbinding.cpp
Change-Id: I98e51ef5af12691196da5772a07d3d53d213efcc
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/qmltest.pro | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 48546d5f64..00c5aaef45 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -13,12 +13,6 @@ qtHaveModule(widgets) { DEFINES += QT_QMLTEST_WITH_WIDGETS } -# Install qmltestcase.prf into the Qt mkspecs so that "CONFIG += qmltestcase" -# can be used in customer applications to build against QtQuickTest. -feature.path = $$[QT_INSTALL_DATA]/mkspecs/features -feature.files = $$PWD/features/qmltestcase.prf -INSTALLS += feature - SOURCES += \ $$PWD/quicktest.cpp \ $$PWD/quicktestevent.cpp \ |