diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-01 04:06:39 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-01 04:06:39 (GMT) |
| commit | 111c9143dc34be69c503a90bf9d6f6e5f5f67041 (patch) | |
| tree | d196c26b30a06efa46d650c7094dc73c873aea98 /tools/linguist/shared/profileevaluator.cpp | |
| parent | 596d9378943755bc63b486919b5616132efa7ab3 (diff) | |
| parent | b9f484ae5d415d95df897e18059c054527111374 (diff) | |
| download | Qt-111c9143dc34be69c503a90bf9d6f6e5f5f67041.zip Qt-111c9143dc34be69c503a90bf9d6f6e5f5f67041.tar.gz Qt-111c9143dc34be69c503a90bf9d6f6e5f5f67041.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/linguist/shared/profileevaluator.cpp')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 0be6bec..ae46ad8 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -894,7 +894,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths() { QStringList concat; { - const QString base_concat = QDir::separator() + QString(QLatin1String("features")); + const QString base_concat = QDir::separator() + QLatin1String("features"); concat << base_concat + QDir::separator() + QLatin1String("mac"); concat << base_concat + QDir::separator() + QLatin1String("macx"); concat << base_concat + QDir::separator() + QLatin1String("unix"); @@ -903,7 +903,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths() concat << base_concat + QDir::separator() + QLatin1String("qnx6"); concat << base_concat; } - const QString mkspecs_concat = QDir::separator() + QString(QLatin1String("mkspecs")); + const QString mkspecs_concat = QDir::separator() + QLatin1String("mkspecs"); QStringList feature_roots; QByteArray mkspec_path = qgetenv("QMAKEFEATURES"); if (!mkspec_path.isNull()) |