diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-05-24 14:32:10 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-05-25 11:48:12 +0200 |
| commit | 1381b5922237cf57f0d6907ba6980ea9f0aed75d (patch) | |
| tree | 2a628113fec842c9d22ad615784dab3a1589bcc0 | |
| parent | f57e6a3b03b344e1f331c7b43dfd50d2076ed42c (diff) | |
Remove last remainings of Qt Quick 1 imports
amends e1fd6074935cd0be0
Change-Id: I4587ae287635bc9718325a24bee728f1c1938978
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | dist/README | 1 | ||||
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 5 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 2a52625f4f..9ccca57ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ qt*-config.pri !/lib/README /plugins/ -/imports/ /qml/ /doc/*.qch diff --git a/dist/README b/dist/README index f6e6775d6a..2fee1d31f1 100644 --- a/dist/README +++ b/dist/README @@ -82,7 +82,6 @@ For example: - Qt Assistant, the Qt documentation reader - Qt QML Scene, the viewer for Qt Quick 2 files -- Qt QML Viewer, the viewer for Qt Quick 1 files and - Qt Designer, the GUI designer for Qt widgets-based applications You can use Qt Creator to develop with other Qt versions as well: diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index f17f85da9f..da7ac28e28 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -101,11 +101,6 @@ */ /*! - \externalpage http://doc.qt.io/qt-4.8/qtquick.html - \title Qt Quick 1 Reference Documentation -*/ - -/*! \externalpage http://wiki.qt.io/Qt_Localization \title external: Translating Qt Into Other Languages */ diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 16ed37c018..95a0f42625 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -4434,7 +4434,6 @@ \li QT_INSTALL_DOCS - location of documentation \li QT_INSTALL_EXAMPLES - location of examples \li QT_INSTALL_HEADERS - location for all header files - \li QT_INSTALL_IMPORTS - location of QML 1.x extensions \li QT_INSTALL_LIBEXECS - location of executables required by libraries at runtime \li QT_INSTALL_LIBS - location of libraries \li QT_INSTALL_PLUGINS - location of Qt plugins |