Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -236,6 +236,7 @@ IF(WITH_QT5)
           ${WINSDK_LIBRARY_DIR}/OpenGL32.lib
           ${WINSDK_LIBRARY_DIR}/WinMM.Lib)
         ADD_QT_PLUGIN(platforms qwindows)
+        ADD_QT_LIBRARY(PlatformSupport)
       ELSEIF(APPLE)
         # Cups needs .dylib
         SET(OLD_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -257,7 +258,9 @@ IF(WITH_QT5)
 
         ADD_QT_PLUGIN(printsupport cocoaprintersupport)
         ADD_QT_PLUGIN(platforms qcocoa)
+        ADD_QT_LIBRARY(PlatformSupport)
       ELSE()
+        # order is very important there
         ADD_QT_PLUGIN(platforms qxcb)
         ADD_QT_PLUGIN(xcbglintegrations qxcb-glx-integration)
 

code/nel/src/gui/group_html.cpp

@@ -5361,8 +5361,8 @@ namespace NLGUI
 				if (it->second == "lighter")
 				{
 					const uint lighter[] = {100, 100, 100, 100, 100, 400, 400, 700, 700};
-					int index = getFontWeight() / 100 - 1;
-					clamp(index, 1, 9);
+					uint index = getFontWeight() / 100 - 1;
+					clamp(index, 1u, 9u);
 					weight = lighter[index-1];
 				}
 				else
@@ -5377,7 +5377,7 @@ namespace NLGUI
 				if (fromString(it->second, weight))
 				{
 					weight = (weight / 100);
-					clamp(weight, 1, 9);
+					clamp(weight, 1u, 9u);
 					weight *= 100;
 				}
 				style.FontWeight = weight;