branch: 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/branches/BRANCH_1_6_X@28783 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiApplication.cpp

@@ -645,7 +645,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
 };
@@ -658,13 +657,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;
 }
 

status.16x

@@ -55,6 +55,8 @@ What's new
 
 * USER INTERFACE
 
+- Fix the loss of clipboard contents on exit (bug 5769).
+
 - Improve the selection of table cells with the keyboard (bug 1802).
 
 - Correct cursor movement in cases where the cursor jumped to a different