Commit 349c974c authored by Kevin Funk's avatar Kevin Funk
Browse files

Merge remote-tracking branch 'origin/1.7'

Conflicts:
	shell/languagecontroller.cpp
parents 2c13b754 db957849
......@@ -252,7 +252,8 @@ void ExternalScriptPlugin::execute( ExternalScriptItem* item, const KUrl& url )
void ExternalScriptPlugin::execute(ExternalScriptItem* item) const
{
execute( item, KDevelop::ICore::self()->documentController()->activeDocument()->url() );
auto document = KDevelop::ICore::self()->documentController()->activeDocument();
execute( item, document ? document->url() : KUrl() );
}
bool ExternalScriptPlugin::executeCommand ( QString command, QString workingDirectory ) const
......
......@@ -304,7 +304,9 @@ private:
PatchReviewPlugin::~PatchReviewPlugin() {
removeHighlighting();
delete m_patch;
// Tweak to work around a crash on OS X; see https://bugs.kde.org/show_bug.cgi?id=338829
// and http://qt-project.org/forums/viewthread/38406/#162801
m_patch->deleteLater();
}
void PatchReviewPlugin::clearPatch( QObject* _patch ) {
......
......@@ -328,8 +328,9 @@ QList<ILanguage*> LanguageController::languagesForUrl(const KUrl &url)
languages = languagesForMimetype(mimeType.name());
if(!extension.isEmpty())
if(!extension.isEmpty()) {
d->fileExtensionCache.insert(extension, languages);
}
return languages;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment