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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47
This commit is contained in:
Oswald Buddenhagen
2016-01-04 14:11:07 +01:00
parent dbc49a32b8 f4545031f9
commit 5a7d3e78db
24 changed files with 3104 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/fancylineedit.cpp
View File

@@ -103,7 +103,7 @@ public:
bool m_iconEnabled[2];
bool m_isFiltering = false;
bool m_firstChange = false;
bool m_firstChange = true;
QString m_lastFilterText;