1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove support for qml1 plugins and modules

Browse Source 
The Qt Quick 1 module got dropped in Qt 5.6, and
almost certainly doesn't compile anymore.

Change-Id: Ia1ae6937e9cc4d99508be8eeeff9b12d0f001002
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Kai Koehne 2018-10-04 10:08:26 +02:00 committed by Liang Qi
parent a94a3098d0
commit 1983abddc0
5 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -98,7 +98,6 @@ qt*-config.pri
/bin/qhelpgenerator /bin/qhelpgenerator
/bin/qlalr /bin/qlalr
/bin/qml /bin/qml
/bin/qml1plugindump
/bin/qmleasing /bin/qmleasing
/bin/qmlimportscanner /bin/qmlimportscanner
/bin/qmljs /bin/qmljs

13
mkspecs/features/qml1_module.prf
View File

@ -1,13 +0,0 @@
#
# W A R N I N G
# -------------
#
# This file is not part of the Qt API. It exists purely as an
# implementation detail. It may change from version to version
# without notice, or even be removed.
#
# We mean it.
#
CONFIG += qml1_target
load(qml_module)

13
mkspecs/features/qml1_plugin.prf
View File

@ -1,13 +0,0 @@
#
# W A R N I N G
# -------------
#
# This file is not part of the Qt API. It exists purely as an
# implementation detail. It may change from version to version
# without notice, or even be removed.
#
# We mean it.
#
CONFIG += qml1_target
load(qml_plugin)

12
mkspecs/features/qml_module.prf
View File

@ -23,15 +23,9 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL
load(qt_build_paths) load(qt_build_paths)
qml1_target { DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
instbase = $$[QT_INSTALL_IMPORTS]
} else {
DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
instbase = $$[QT_INSTALL_QML]
}
!qml1_target:static: \ static: \
CONFIG += builtin_resources CONFIG += builtin_resources
else: \ else: \
CONFIG += install_qml_files CONFIG += install_qml_files
@ -52,7 +46,7 @@ qmldir.base = $$_PRO_FILE_PWD_
# Tools need qmldir and plugins.qmltypes always installed on the file system # Tools need qmldir and plugins.qmltypes always installed on the file system
qmldir.files = $$qmldir_file $$fq_aux_qml_files qmldir.files = $$qmldir_file $$fq_aux_qml_files
install_qml_files: qmldir.files += $$fq_qml_files install_qml_files: qmldir.files += $$fq_qml_files
qmldir.path = $$instbase/$$TARGETPATH qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
INSTALLS += qmldir INSTALLS += qmldir
!debug_and_release|!build_all|CONFIG(release, debug|release) { !debug_and_release|!build_all|CONFIG(release, debug|release) {

25
mkspecs/features/qml_plugin.prf
View File

@ -48,15 +48,9 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE
load(qt_build_paths) load(qt_build_paths)
qml1_target { DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
instbase = $$[QT_INSTALL_IMPORTS]
} else {
DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
instbase = $$[QT_INSTALL_QML]
}
target.path = $$instbase/$$TARGETPATH target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
INSTALLS += target INSTALLS += target
# Some final setup # Some final setup
@ -75,20 +69,11 @@ load(qt_common)
# directory. Then review and commit the changes made to plugins.qmltypes. # directory. Then review and commit the changes made to plugins.qmltypes.
# #
!cross_compile { !cross_compile {
qml1_target { qmlplugindump = qmlplugindump
qmlplugindump = qml1plugindump importpath.name = QML2_IMPORT_PATH
importpath.name = QML_IMPORT_PATH
} else {
qmlplugindump = qmlplugindump
importpath.name = QML2_IMPORT_PATH
}
importpath.value = importpath.value =
for(qmod, QTREPOS) { for(qmod, QTREPOS) {
qml1_target: \ exists($$qmod/qml): importpath.value += $$shell_path($$qmod/qml)
qmod = $$qmod/imports
else: \
qmod = $$qmod/qml
exists($$qmod): importpath.value += $$shell_path($$qmod)
} }
importpath.value = $$unique(importpath.value) importpath.value = $$unique(importpath.value)
QT_TOOL_ENV = importpath QT_TOOL_ENV = importpath