feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use completeBaseName for operations on paths.

Browse Source 
Task-number: QTCREATORBUG-13967
Change-Id: Ie70f861138f1cf4c3f098a363274cb99bcf97c03
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Jarek Kobus
2015-02-25 08:33:49 +01:00
parent ed271ed750
commit 30d80ad020
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
View File

@@ -753,7 +753,7 @@ void NonInternalLibraryDetailsController::slotLibraryPathChanged()
if (parentFolderName != QLatin1String("debug") && if (parentFolderName != QLatin1String("debug") &&
parentFolderName != QLatin1String("release")) parentFolderName != QLatin1String("release"))
subfoldersEnabled = false; subfoldersEnabled = false;
const QString baseName = fi.baseName(); const QString baseName = fi.completeBaseName();
if (baseName.isEmpty() || baseName.at(baseName.size() - 1).toLower() != QLatin1Char('d')) if (baseName.isEmpty() || baseName.at(baseName.size() - 1).toLower() != QLatin1Char('d'))
removeSuffixEnabled = false; removeSuffixEnabled = false;
@@ -786,18 +786,18 @@ QString NonInternalLibraryDetailsController::snippet() const
const bool removeSuffix = isWindowsGroupVisible() const bool removeSuffix = isWindowsGroupVisible()
&& libraryDetailsWidget()->removeSuffixCheckBox->isChecked(); && libraryDetailsWidget()->removeSuffixCheckBox->isChecked();
if (creatorPlatform() == CreatorWindows) { if (creatorPlatform() == CreatorWindows) {
libName = fi.baseName(); libName = fi.completeBaseName();
if (removeSuffix && !libName.isEmpty()) // remove last letter which needs to be "d" if (removeSuffix && !libName.isEmpty()) // remove last letter which needs to be "d"
libName = libName.left(libName.size() - 1); libName = libName.left(libName.size() - 1);
if (fi.completeSuffix() == QLatin1String("a")) // the mingw lib case if (fi.completeSuffix() == QLatin1String("a")) // the mingw lib case
libName = libName.mid(3); // cut the "lib" prefix libName = libName.mid(3); // cut the "lib" prefix
} else if (creatorPlatform() == CreatorMac) { } else if (creatorPlatform() == CreatorMac) {
if (macLibraryType() == AddLibraryWizard::FrameworkType) if (macLibraryType() == AddLibraryWizard::FrameworkType)
libName = fi.baseName(); libName = fi.completeBaseName();
else else
libName = fi.baseName().mid(3); // cut the "lib" prefix libName = fi.completeBaseName().mid(3); // cut the "lib" prefix
} else { } else {
libName = fi.baseName().mid(3); // cut the "lib" prefix libName = fi.completeBaseName().mid(3); // cut the "lib" prefix
} }
QString targetRelativePath; QString targetRelativePath;
@@ -946,7 +946,7 @@ void ExternalLibraryDetailsController::updateWindowsOptionsEnablement()
if (parentFolderName != QLatin1String("debug") && if (parentFolderName != QLatin1String("debug") &&
parentFolderName != QLatin1String("release")) parentFolderName != QLatin1String("release"))
subfoldersEnabled = false; subfoldersEnabled = false;
const QString baseName = fi.baseName(); const QString baseName = fi.completeBaseName();
if (baseName.isEmpty() || baseName.at(baseName.size() - 1).toLower() != QLatin1Char('d')) if (baseName.isEmpty() || baseName.at(baseName.size() - 1).toLower() != QLatin1Char('d'))
removeSuffixEnabled = false; removeSuffixEnabled = false;