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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h

Change-Id: I43d2571617bfbf41c0fcf23502ab77975540eba4
This commit is contained in:
Eike Ziller
2018-01-17 09:30:57 +01:00
parent 76bc20ffce 2765409d2b
commit 115afed94b
113 changed files with 3769 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/sqlite/utf8string.h
View File

@@ -171,7 +171,8 @@ public:
byteArray.reserve(reserveSize);
}
static Utf8String number(int number, int base=10)
template<typename T>
static Utf8String number(T number, int base = 10)
{
return Utf8String::fromByteArray(QByteArray::number(number, base));
}