summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <[email protected]>2015-06-01 10:10:44 +0200
committerRalf Habacker <[email protected]>2015-06-01 10:30:54 +0200
commit8fe0fc944798a3de982ca65febea8098404033a0 (patch)
treecfb9953d2a8506cd4a60274854da6004297f4e94
parent9cedfcff3e5d146d3ee8cc9d52b02f677a528beb (diff)
Merge in KF5 variant of KTextEditor from frameworks branch.
-rw-r--r--umbrello/umlappprivate.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
index 76a1c53..fd04630 100644
--- a/umbrello/umlappprivate.h
+++ b/umbrello/umlappprivate.h
@@ -56,7 +56,11 @@ public:
view(0),
document(0)
{
+#if QT_VERSION >= 0x050000
+ editor = KTextEditor::Editor::instance();
+#else
editor = KTextEditor::EditorChooser::editor();
+#endif
logWindow = new QListWidget;
connect(logWindow, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotLogWindowItemDoubleClicked(QListWidgetItem *)));
}