forked from qt-creator/qt-creator
		
	Utils: Simplify tooltip architecture and cleanup
This mainly merges TipContents into the the actual tooltip labels. Change-Id: I64b576c987bce034842f7e3f324b81595dae0713 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
		@@ -44,7 +44,6 @@
 | 
			
		||||
#include <texteditor/texteditor.h>
 | 
			
		||||
 | 
			
		||||
#include <utils/tooltip/tooltip.h>
 | 
			
		||||
#include <utils/tooltip/tipcontents.h>
 | 
			
		||||
#include <utils/qtcassert.h>
 | 
			
		||||
 | 
			
		||||
#include <QAbstractItemModel>
 | 
			
		||||
@@ -688,7 +687,7 @@ public:
 | 
			
		||||
        if (parentWidget()) {
 | 
			
		||||
            // We are currently within a text editor tooltip:
 | 
			
		||||
            // Rip out of parent widget and re-show as a tooltip
 | 
			
		||||
            Utils::TipContent::pinToolTip(this, ICore::mainWindow());
 | 
			
		||||
            Utils::ToolTip::pinToolTip(this, ICore::mainWindow());
 | 
			
		||||
        } else {
 | 
			
		||||
            // We have just be restored from session data.
 | 
			
		||||
            setWindowFlags(Qt::ToolTip);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user