Commit 7d907c64 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

Patch for Ubuntu by Scott Corley

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@156 c8aa9fed-2811-0410-8543-893ada326672
parent a6f5a288
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <QTranslator> #include <QTranslator>
#include <QLocale> #include <QLocale>
#include <QFont> #include <QFont>
#include <QClipboard>
#include <vector> #include <vector>
#ifdef KREPLACEMENTS_H #ifdef KREPLACEMENTS_H
...@@ -250,9 +251,12 @@ int main(int argc, char *argv[]) ...@@ -250,9 +251,12 @@ int main(int argc, char *argv[])
{ {
KDiff3Shell* p = new KDiff3Shell(); KDiff3Shell* p = new KDiff3Shell();
p->show(); p->show();
p->setWindowState( p->windowState() | Qt::WindowActive ); // Patch for ubuntu: window not active on startup
} }
//app.installEventFilter( new CFilter ); //app.installEventFilter( new CFilter );
int retVal = app.exec(); int retVal = app.exec();
if (QApplication::clipboard()->text().size() == 0)
QApplication::clipboard()->clear(); // Patch for Ubuntu: Fix issue with Qt clipboard
return retVal; return retVal;
} }
......
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