diff options
| -rw-r--r-- | doc/installerfw.qdoc | 6 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index ad139812e..1a7624080 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -251,7 +251,8 @@ \o Filename for the configuration file on the target. Default is components.xml. \row \o Pages - \o List of pages. + \o Custom strings for labels in the installer pages. Deprecated, + see \l{Translating Pages} instead. \endtable */ @@ -330,6 +331,9 @@ when using \a qsTr or the class name of the UI file when translating a user interface. + \note The translation system can also be used to customize the UI. Use e.g. + an \c en_en.ts file to replace any text in the installer with a custom English + version. */ /*! diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 7dcb57e68..a01836253 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -243,6 +243,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix) s.addDefaultRepositories(readRepositories(reader, true)); if (name == scPages) { + qWarning() << "Deprecated element 'Pages'."; QHash<QString, QVariantHash> pages = readPages(reader); const QStringList &keys = pages.keys(); foreach (const QString &key, keys) diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 4029ace67..c1d607074 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -72,6 +72,7 @@ void tst_Settings::loadTutorialConfig() void tst_Settings::loadFullConfig() { + QTest::ignoreMessage(QtWarningMsg, "Deprecated element 'Pages'. "); Settings settings = Settings::fromFileAndPrefix(":///data/full_config.xml", ":///data"); } |