diff options
| -rw-r--r-- | doc/reference/modules/qt-modules.qdoc | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/doc/reference/modules/qt-modules.qdoc b/doc/reference/modules/qt-modules.qdoc index 7580b1eb5..7f29be65a 100644 --- a/doc/reference/modules/qt-modules.qdoc +++ b/doc/reference/modules/qt-modules.qdoc @@ -152,7 +152,7 @@ \li Qt SVG \li \row - \li test + \li testlib \li Qt Test \li \row diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 1bd2bc830..74c9821e9 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -97,6 +97,16 @@ static void replaceListPlaceholder(QByteArray &content, const QByteArray &placeH content.replace(placeHolder, listString); } +// We erroneously called the "testlib" module "test" for quite a while. Let's not punish users +// for that. +static void addTestModule(QList<QtModuleInfo> &modules) +{ + QtModuleInfo testModule(QLatin1String("QtTest"), QLatin1String("test"), + QStringList() << QLatin1String("testlib")); + testModule.hasLibrary = false; + modules << testModule; +} + static void createModules(Profile &profile, Settings *settings, const QtEnvironment &qtEnvironment) { @@ -142,7 +152,7 @@ static void createModules(Profile &profile, Settings *settings, QStringList() << QLatin1String("gui")); widgetsModule.hasLibrary = false; modules << widgetsModule; - + addTestModule(modules); } else { QDirIterator dit(qtEnvironment.mkspecBasePath + QLatin1String("/modules")); while (dit.hasNext()) { @@ -191,6 +201,8 @@ static void createModules(Profile &profile, Settings *settings, } } modules << moduleInfo; + if (moduleInfo.qbsName == QLatin1String("testlib")) + addTestModule(modules); } } |