Merge remote-tracking branch 'origin/4.1'

Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:59:28 +03:00
parent 713bc04ad4 d004203b13
commit 1853f01a5b
125 changed files with 1416 additions and 1407 deletions
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -38,6 +38,7 @@
 #include <QString>

 #include <algorithm>
+#include <cmath>
 #include <cstdlib>
 #include <climits>
 #include <cstring>