diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-09-01 00:29:29 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-09-01 00:30:07 +1000 |
| commit | cae4c2337cff0a927842a57f1b6bee520fd87a9c (patch) | |
| tree | 55644512895d52ff5a9f18df70b64f1b97b29ea2 /dev-util/kdevelop/files | |
| parent | 661f2a7f99f4c0268d8fbec256ed4b3d08342906 (diff) | |
| download | kde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.tar.gz kde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.tar.bz2 kde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.zip | |
dev-util/kdevelop: moved to main tree
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-util/kdevelop/files')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch deleted file mode 100644 index 9b15fe95482..00000000000 --- a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Milian Wolff <mail@milianw.de> -Date: Mon, 22 Aug 2016 10:47:26 +0000 -Subject: Fix compile -X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa ---- -Fix compile - -BUG: 367659 ---- - - ---- a/languages/cpp/cppduchain/cppducontext.cpp -+++ b/languages/cpp/cppduchain/cppducontext.cpp -@@ -39,7 +39,8 @@ - REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData); - - template<> --QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const { -+QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, -+ AbstractNavigationWidget::DisplayHints /*hints*/) const { - if( decl == 0 ) { - Path path( url().str() ); - IncludeItem i; -@@ -55,7 +56,8 @@ - } - - template<> --QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const { -+QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, -+ AbstractNavigationWidget::DisplayHints /*hints*/) const { - if( decl == 0 ) { - if( owner() ) - return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix ); - ---- a/languages/cpp/cppduchain/cppducontext.h -+++ b/languages/cpp/cppduchain/cppducontext.h -@@ -652,7 +652,8 @@ - return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 ); - } - -- virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override; -+ virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, -+ KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override; - - enum { - Identity = BaseContext::Identity + 50 - |