Merge remote-tracking branch 'origin/master' into frameworks

Authored by kfunk on Feb 14 2014, 8:38 AM.

Description

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
language/CMakeLists.txt
language/codegen/basicrefactoring.cpp
plugins/grepview/grepoutputview.cpp

Details

Committed
kfunkFeb 14 2014, 8:38 AM
Parents
R32:a17205160420: Document returnType test
R32:3b72b6a5ee2e: Don't include QJson header
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
a17205160420olivierjg
Document returnType test 
Feb 14 2014
e3d224ea1f00kfunk
Add porting note 
Feb 13 2014
6443bd577c7fkfunk
Merge remote-tracking branch 'origin/1.6' 
Feb 13 2014
0c2d8dc7755fkfunk
Make compile 
Feb 13 2014
da01132ff579kfunk
Output filter: Support Waf and scons, too 
Feb 13 2014
3ccc6e0174fckfunk
Merge remote-tracking branch 'origin/1.6' 
Feb 13 2014
b82a72dbc46dkfunk
gdbtest: Fix one of the test methods 
Feb 13 2014
a8b96bfa541bkfunk
Fix potential crash in BreakpointModel::removeRows 
Feb 13 2014
e56827dc004bkfunk
Add filter expression for QtTest failure locations 
Feb 13 2014
48a5dd9a59a6kfunk
Remove unneeded files in root directory 
Feb 12 2014
e822f82a4645kfunk
Add possibility to open folders in external program 
Feb 12 2014
a0d7fcf700d2mwolff
Try to fix GCC build on the CI server: 
Feb 11 2014
83365b0cb5dbmwolff
Fix crashes due to Problem serialization. 
Feb 11 2014
254b7f1c7871mwolff
Add unit test for ProblemSerialization, it will crash as-is. 
Feb 11 2014
f1b60d460943mwolff
Fix compiler warning 
Feb 11 2014
f0878001811dmwolff
Remove unneeded API and make LocalProblemIndex movable. 
Feb 11 2014
e3a538282770kfunk
Minor: Remove unnused includes 
Feb 11 2014
be12a65310c8kfunk
Update my copyright info 
Feb 11 2014
e236e69ebf9akfunk
Merge remote-tracking branch 'origin/1.6' 
Feb 11 2014
a6f3bf06c14ckfunk
GrepView: Initialize correctly 
Feb 10 2014
0a51a3909841kfunk
GrepView: Fix disconnect() warning on first use 
Feb 10 2014
bb2829bd1617kfunk
Icon fixes 
Feb 10 2014
47cf51e64514skalinichev
Fix crash issue when DuChain was unlocked to early. 
Feb 10 2014
c1e0da51c746kfunk
GCC: Turn off -Wmissing-field-initializers 
Feb 10 2014
b332c53b4c09kfunk
Merge remote-tracking branch 'origin/1.6' 
Feb 10 2014
05093f20e844l10n daemon script
SVN_SILENT made messages (.desktop file) 
Feb 10 2014
d3994b555890brauch
Allow language plugins to provide styles to formatters 
Feb 9 2014
78e09bf2428cbrauch
cleanup: move implementation of exported SourceFormatterStyle to cpp file 
Feb 9 2014
8f4c04a1161aDavid Stevens/kfunk
Patch for bug 328307 
Feb 9 2014
4837afac7027l10n daemon script
SVN_SILENT made messages (.desktop file) 
Feb 9 2014
49e4b656f0e5mwolff
Share code between partial data loading functions. 
Feb 7 2014
74b7da85c8e1mwolff
Get rid of s_temporaryDataMutex. 
Feb 7 2014
337a60e9e7famwolff
Share common code for file paths to serialized topducontext data. 
Feb 7 2014
5b50589b296amwolff
Do not emit warnings when starting a new KDevelop session. 
Feb 7 2014
e5e1775c07f9kfunk
Introduce NativeAppErrorFilteringStrategy 
Feb 7 2014
322966dd5f41kfunk
OutputView: Reduce some code duplication 
Feb 7 2014
f55a13d5bb3ekfunk
Minor: Consistent method naming 
Feb 7 2014
1c7e018c0d4bAndrey Matveyakin
Add code navigation via mouse forward/backward buttons 
Feb 5 2014
526eb3e8448fkfunk
Grepview: Colorize the correct label on error 
Feb 5 2014
1ddbee68981akfunk
Variables toolview: Make it possible to show types 
Feb 5 2014
29ba9b6dec90kfunk
Minor: Fix strings 
Feb 5 2014
2a397817643fkfunk
Minor: Fix some strings 
Feb 4 2014
1d50bf3096fckfunk
Merge remote-tracking branch 'origin/1.6' 
Feb 4 2014
5466491a9248kfunk
Minor: Fix apidocs a bit 
Feb 4 2014
6388442c0745kfunk
Session chooser: Fix selection of default entry 
Feb 4 2014
d1c7ef4ca82dkfunk
Session chooser: Fix "Create New Session" item 
Feb 4 2014
0e12d294130dbrauch
Re-use logic from DUChainUtils in DeclarationContext 
Feb 4 2014
35ce695605b5skalinichev
Port refactoring progress dialog to kdevplatform 
Feb 3 2014
a846cb4bb7easkalinichev
Reuse code in Refactor widget. 
Feb 3 2014
08cf0af1814dBranko Čibej/mwolff
SVN plugin: Never launch configured external diff and diff3 tools. 
Feb 3 2014