diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-11 12:41:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-11 14:13:50 +0100 |
commit | 3a624a37a54b179a7e37762e978b0dc570441b47 (patch) | |
tree | b1bdf8335a95f533406a62ddbcdaa4e33a78bd09 /src/plugins/qt4projectmanager/wizards | |
parent | 101b1ecf71f4c7179963a9016a6eba1d1fdb604d (diff) | |
download | qt-creator-3a624a37a54b179a7e37762e978b0dc570441b47.tar.gz |
Library-Wizard: Do not write module-include.
Remove baseClassModule which was used for that
purpose only.
Change-Id: Id86c9cfc160b76f936cc6b716a1e4c3e93a5261f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards')
3 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp index 762a356b2a..4c1926203c 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp @@ -87,13 +87,7 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t, // include base class header if (!baseClassName.isEmpty()) { - QString include; - if (!baseClassModule.isEmpty()) { - include += baseClassModule; - include += QLatin1Char('/'); - } - include += baseClassName; - Utils::writeIncludeFileDirective(include, true, headerStr); + Utils::writeIncludeFileDirective(baseClassName, true, headerStr); headerStr << '\n'; } diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h index 4b533e4b2e..2253f14688 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h @@ -60,7 +60,6 @@ struct LibraryParameters { QString baseClassName; QString sourceFileName; QString headerFileName; - QString baseClassModule; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp index 053845d37d..edd278eac0 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp @@ -354,9 +354,6 @@ LibraryParameters LibraryWizardDialog::libraryParameters() const rc.baseClassName = m_filesPage->baseClassName(); rc.sourceFileName = m_filesPage->sourceFileName(); rc.headerFileName = m_filesPage->headerFileName(); - if (!rc.baseClassName.isEmpty()) - if (const PluginBaseClasses *plb = findPluginBaseClass(rc.baseClassName)) - rc.baseClassModule = QLatin1String(plb->module); return rc; } |