feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
This commit is contained in:
Eike Ziller
2016-05-09 16:37:41 +02:00
parent f63d64330e 605ea627cc
commit 9e66ce48e4
124 changed files with 12956 additions and 12418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/tooltip/tooltip.h
View File

@@ -29,6 +29,7 @@
#include <QSharedPointer>
#include <QObject>
#include <QPointer>
#include <QTimer>
#include <QRect>
@@ -106,7 +107,7 @@ private:
void showTip();
void hideTipWithDelay();
Internal::QTipLabel *m_tip;
QPointer<Internal::QTipLabel> m_tip;
QWidget *m_widget;
QRect m_rect;
QTimer m_showTimer;