[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-python] /: Merge branch 'frameworks'
From:       Sven Brauch <svenbrauch () googlemail ! com>
Date:       2014-12-26 12:42:57
Message-ID: E1Y4UEL-0003uM-Ia () scm ! kde ! org
[Download RAW message or body]

Git commit d15c768f83ebe768cbcd2282d1c0db24955aba66 by Sven Brauch.
Committed on 26/12/2014 at 12:43.
Pushed by brauch into branch 'master'.

Merge branch 'frameworks'

Conflicts:
	CMakeLists.txt
	codecompletion/items/functiondeclaration.cpp
	debugger/kdevpdb.desktop
	duchain/contextbuilder.cpp
	kdevpythonsupport.desktop.cmake
	python-src/Objects/unicodeobject.c
	python-src/Parser/asdl_c.py
	python-src/Parser/tokenizer.c
	python-src/Python/ast.c
	python-src/Python/pythonrun.c
	pythonlanguagesupport.cpp

M  +42   -24   CMakeLists.txt
M  +15   -5    pythonlanguagesupport.cpp
M  +10   -2    pythonlanguagesupport.h

http://commits.kde.org/kdev-python/d15c768f83ebe768cbcd2282d1c0db24955aba66

diff --cc CMakeLists.txt
index cdd6aa4,a0384e5..8e666d9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,8 -2,8 +2,9 @@@ PROJECT(kdevpython
  
  # write the plugin version to a file
  set(KDEVPYTHON_VERSION_MAJOR 1)
- set(KDEVPYTHON_VERSION_MINOR 7)
- set(KDEVPYTHON_VERSION_PATCH 60)
+ set(KDEVPYTHON_VERSION_MINOR 90)
+ set(KDEVPYTHON_VERSION_PATCH 90)
++
  # KDevplatform dependency version
  set( KDEVPLATFORM_VERSION \
"${KDEVPYTHON_VERSION_MAJOR}.${KDEVPYTHON_VERSION_MINOR}.${KDEVPYTHON_VERSION_PATCH}" \
)  
diff --cc pythonlanguagesupport.cpp
index 17f5654,04e7dde..ad2cd31
--- a/pythonlanguagesupport.cpp
+++ b/pythonlanguagesupport.cpp
@@@ -84,12 -85,11 +87,13 @@@ KDevelop::ContextMenuExtension Language
  }
  
  LanguageSupport::LanguageSupport( QObject* parent, const QVariantList& /*args*/ )
-     : KDevelop::IPlugin( KDevPythonSupportFactory::componentData(), parent )
 -        : KDevelop::IPlugin("pythonlanguagesupport", parent ),
 -        KDevelop::ILanguageSupport()
++    : KDevelop::IPlugin("pythonlanguagesupport", parent )
 +    , KDevelop::ILanguageSupport()
 +    , m_highlighting( new Highlighting( this ) )
 +    , m_refactoring( new Refactoring( this ) )
  {
      KDEV_USE_EXTENSION_INTERFACE( KDevelop::ILanguageSupport )
+     KDEV_USE_EXTENSION_INTERFACE( KDevelop::ILanguageCheckProvider )
  
      m_self = this;
  


[prev in list] [next in list] [prev in thread] [next in thread]