diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:07:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 15:36:44 +0200 |
| commit | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (patch) | |
| tree | 334ebaec198a7f31d1e3a4639c70fbb8bb116af2 /mkspecs/features/qml_module.prf | |
| parent | 52d30e2850769d589772576e4714a14241c7da6e (diff) | |
| parent | f57d8f1341587e6b2aa84b8404aa218432584206 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/qtestlib/tutorial5/containers.cpp
examples/widgets/tools/tools.pro
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/network/kernel/qdnslookup_unix.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
tools/configure/configureapp.cpp
Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
Diffstat (limited to 'mkspecs/features/qml_module.prf')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index 6b3ad81953..05f97a5532 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -18,9 +18,6 @@ fq_qml_files = $$qmldir_file for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) -# Only for Qt Creator's project view -OTHER_FILES += $$fq_qml_files - qml1_target: \ instbase = $$[QT_INSTALL_IMPORTS] else: \ |