Fix bug 5769: http://bugzilla.lyx.org/show_bug.cgi?id=5769.

Copy content vanishes on Quit.

The work-around to clear the clipboard was needed to work around bug 4846. This bug has been resolved by the fix for bug 5472, so the work-around isn't needed anymore.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28589 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 172ac0bce479fd1ca07dee58dfd48eb2cdb15e94..9f2d37c67ea5fb1fc675b6b78b3e2657517d556a 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -667,7 +667,6 @@ struct GuiApplication::Private
 
 #ifdef Q_WS_WIN
        /// WMF Mime handler for Windows clipboard.
-       /// \warning: see comment in ~GuiApplication and in bug 4846.
        QWindowsMimeMetafile wmf_mime_;
 #endif
 };
@@ -680,13 +679,6 @@ GuiApplication::~GuiApplication()
 #ifdef Q_WS_MACX
        closeAllLinkBackLinks();
 #endif
-       // FIXME: Work around bug 4846 for Windows Vista and Qt4
-       // (see http://bugzilla.lyx.org/show_bug.cgi?id=4846)
-       // If the clipboard is not cleared, LyX crashes on exit when it is
-       // compiled in release mode and if there is something in the clipboard.
-       // This is related to QWindowsMimeMetafile which is apparently not 
-       // properly destroyed.
-       qApp->clipboard()->clear(QClipboard::Clipboard);
        delete d;
 }