diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:17 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:17 (GMT) |
| commit | ddca33b935b411442a17614f622fdd18846e3a7a (patch) | |
| tree | a78e5f1b66528428a83cc552bafcd574b0ecad8b | |
| parent | ef2f939effb8e0684b5832eb03c71b1427437526 (diff) | |
| download | Qt-ddca33b935b411442a17614f622fdd18846e3a7a.zip Qt-ddca33b935b411442a17614f622fdd18846e3a7a.tar.gz Qt-ddca33b935b411442a17614f622fdd18846e3a7a.tar.bz2 | |
Instead of translating / into _, check if subdir is a .pro.
Previously, .pro files were treated as directories, and a previous
workaround for the issue was to replace / with _ in directory paths.
This was both actually non-sensical and not effective.
This resolves the issue by checking if the subdir has a .pro extension.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 658bb3c..f6499eb 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -310,9 +310,11 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text) continue; if (!project->first((*it) + ".subdir").isEmpty()) gpjname = project->first((*it) + ".subdir"); + /* some SUBDIRS are not actually subdirs, instead .pro files */ + if (gpjname.endsWith(".pro")) + gpjname.chop(4); else - gpjname.replace("_", QDir::separator()); - gpjname += QDir::separator() + gpjname.section(QDir::separator(), -1); + gpjname += QDir::separator() + gpjname.section(QDir::separator(), -1); gpjname += projectSuffix(); /* make relative */ if (!project->values("QT_SOURCE_TREE").isEmpty()) { |