Commit bba29384 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.5'

parents f2677e03 be95a7bb
......@@ -28,6 +28,7 @@ if [ -z "$KDEV_PG_QT_VERSION" ]; then
KDEV_PG_QT_VERSION=v2.2.0
fi
# remove kxmlgui_fixdockvisibilitystatestoring.patch for >5.66.0
# remove ktexteditor_fixdragncopy.patch for >5.66.0
KF5_VERSION=v5.66.0
PLASMA_VERSION=v5.17.5
KDE_RELEASESERVICE_VERSION=v19.12.1
......@@ -185,7 +186,7 @@ build_framework threadweaver
build_framework attica
build_framework knewstuff
build_framework syntax-highlighting
build_framework ktexteditor
(PATCH_FILE=$SCRIPT_DIR/ktexteditor_fixdragncopy.patch build_framework ktexteditor)
build_framework kpackage
build_framework kdeclarative
build_framework kcmutils
......
diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp
index 69272d01..d628b162 100644
--- a/src/view/kateviewinternal.cpp
+++ b/src/view/kateviewinternal.cpp
@@ -3238,7 +3238,7 @@ void KateViewInternal::doDrag()
QMimeData *mimeData = new QMimeData();
mimeData->setText(view()->selectionText());
m_dragInfo.dragObject->setMimeData(mimeData);
- m_dragInfo.dragObject->exec(Qt::MoveAction);
+ m_dragInfo.dragObject->exec(Qt::MoveAction | Qt::CopyAction);
}
void KateViewInternal::dragEnterEvent(QDragEnterEvent *event)
......@@ -20,7 +20,7 @@
#ifndef KDEVPLATFORM_STATUSBAR_H
#define KDEVPLATFORM_STATUSBAR_H
#include <QTime>
#include <QElapsedTimer>
#include <QHash>
#include <QStatusBar>
......@@ -84,7 +84,7 @@ private:
QHash<IStatus*, Message> m_messages;
QTimer* const m_timer;
QTime m_time;
QElapsedTimer m_time;
Sublime::View* m_currentView;
QHash<IStatus*,ProgressItem*> m_progressItems;
StatusbarProgressWidget* m_progressWidget; // embedded in the statusbar, shows a single progressbar & button to expand the overlay widget
......
......@@ -23,7 +23,7 @@
#include "testproject.h"
#include <QTemporaryFile>
#include <QTime>
#include <QElapsedTimer>
#include <QTest>
#include <language/duchain/duchainlock.h>
......@@ -176,7 +176,7 @@ bool TestFile::waitForParsed(int timeout)
// optimize: we don't want to wait the usual timeout before parsing documents here
ICore::self()->languageController()->backgroundParser()->parseDocuments();
}
QTime t;
QElapsedTimer t;
t.start();
while (!d->ready && t.elapsed() < timeout) {
QTest::qWait(10);
......
......@@ -107,7 +107,7 @@ bool waitForState(MIDebugSession *session, KDevelop::IDebugSession::DebuggerStat
const char *file, int line, bool waitForIdle)
{
QPointer<MIDebugSession> s(session); //session can get deleted in DebugController
QTime stopWatch;
QElapsedTimer stopWatch;
stopWatch.start();
// legacy behavior for tests that implicitly may require waiting for idle,
......
......@@ -29,7 +29,7 @@
#include <QPointer>
#include <QString>
#include <QTime>
#include <QElapsedTimer>
#include <QUrl>
namespace KDevMI
......@@ -57,7 +57,7 @@ public:
bool waitUnless(bool ok);
private:
QTime stopWatch;
QElapsedTimer stopWatch;
QPointer<MIDebugSession> session;
const char* condition;
const char* file;
......
......@@ -54,6 +54,7 @@
#include <QSignalSpy>
#include <QTest>
#include <QTemporaryFile>
#include <QElapsedTimer>
#define SKIP_IF_ATTACH_FORBIDDEN() \
do { \
......@@ -219,7 +220,7 @@ public:
}
private:
QTime stopWatch;
QElapsedTimer stopWatch;
QPointer<DebugSession> session;
const char * condition;
const char * file;
......@@ -2082,7 +2083,7 @@ bool GdbTest::waitForState(DebugSession *session, DebugSession::DebuggerState st
const char *file, int line, bool waitForIdle)
{
QPointer<MIDebugSession> s(session); //session can get deleted in DebugController
QTime stopWatch;
QElapsedTimer stopWatch;
stopWatch.start();
// legacy behavior for tests that implicitly may require waiting for idle,
......
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