Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-09-21 23:23:51 +02:00
commit d559db4fb1
10 changed files with 63 additions and 12 deletions

View file

@ -31,9 +31,11 @@ public:
static Clipboard* instance();
public Q_SLOTS:
void clearCopiedText();
private Q_SLOTS:
void clearClipboard();
void cleanup();
private:
explicit Clipboard(QObject* parent = nullptr);