Diffusion KDevelop 14fcc5122b65

Merge branch '5.1'
14fcc5122b65
Actions

Authored by kossebau on Apr 21 2017, 1:48 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate
  3. app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate
  4. app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate
  5. app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate

Details

Committed
kossebauApr 21 2017, 1:48 PM
Parents
R32:70047de580bc: Drop explicit %{PROJECTDIR}/ from templates' ShowFilesAfterGeneration
R32:b124c3a04cbe: Use openDeclaration(Identifier) in CMake plugin.
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
70047de580bcD5531kossebau
Drop explicit %{PROJECTDIR}/ from templates' ShowFilesAfterGeneration 
Apr 21 2017

Changes (6)

PathPackages
Mapp_templates/cpp/CMake/cmake_kdevplugin/cmake_kdevplugin.kdevtemplate
Mapp_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate
Mapp_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate
Mapp_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate
Mapp_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
Mapp_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate

R32:14fcc5122b65

View Options

app_templates/cpp/CMake/cmake_kdevplugin/cmake_kdevplugin.kdevtemplate

Loading...
View Options

app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate

Loading...
View Options

app_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate

Loading...
View Options

app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate

Loading...
View Options

app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate

Loading...
View Options

app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate

Loading...