diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-27 12:50:10 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-27 14:00:57 +0100 |
| commit | aa93423145f7ce031be0ddd668a014fb73ba8250 (patch) | |
| tree | 855c44da4d9072e539b0cc0b2de477c404cc091a | |
| parent | 3f4465a78a6ab571dc600235bfc53614d8e92a64 (diff) | |
qtprofilesetup: Fix detection for DataVisualization module.
This one also uses a different naming scheme for some reason.
Change-Id: I47a419e85f8f8eba5559da2c896e2660b80284c2
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
| -rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index f3287948f..4ae256f8d 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -129,11 +129,12 @@ QString QtModuleInfo::libraryBaseName(const QtEnvironment &qtEnvironment, if (isPlugin) return libBaseName(name, debugBuild, qtEnvironment); - // Enginio has a different naming scheme, so it doesn't get boring. - const bool isEnginio = name == QLatin1String("Enginio"); + // Some modules use a different naming scheme, so it doesn't get boring. + const bool libNameBroken = name == QLatin1String("Enginio") + || name == QLatin1String("DataVisualization"); - QString libName = modulePrefix.isEmpty() && !isEnginio ? QLatin1String("Qt") : modulePrefix; - if (qtEnvironment.qtMajorVersion >= 5 && !isFramework(qtEnvironment) && !isEnginio) + QString libName = modulePrefix.isEmpty() && !libNameBroken ? QLatin1String("Qt") : modulePrefix; + if (qtEnvironment.qtMajorVersion >= 5 && !isFramework(qtEnvironment) && !libNameBroken) libName += QString::number(qtEnvironment.qtMajorVersion); libName += moduleNameWithoutPrefix(); libName += qtEnvironment.qtLibInfix; |