Merge branch '2.0'

2015-09-26 11:43:27 +02:00
parent c8ae31a248 bcb54bc38a
commit 3b2a39fd38
16 changed files with 73 additions and 72 deletions
--- a/src/gui/entry/EntryModel.cpp
+++ b/src/gui/entry/EntryModel.cpp
@@ -243,7 +243,7 @@ QMimeData* EntryModel::mimeData(const QModelIndexList& indexes) const
        return nullptr;
    }
    else {
-        data->setData(mimeTypes().first(), encoded);
+        data->setData(mimeTypes().at(0), encoded);
        return data;
    }
 }