From 28df94987033b0afa6c8680a47aaec54d699864b Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 26 Dec 2015 15:12:29 +0100 Subject: [PATCH 1/2] Fixed: Forgot to link to PlatformSupport under other platforms --HG-- branch : develop --- code/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index ff097e0a7..0fb80a76a 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -232,6 +232,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}) @@ -253,7 +254,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) From 478a2102b8d84024b84a178054418e129e746589 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 26 Dec 2015 15:12:41 +0100 Subject: [PATCH 2/2] Fixed: GCC warnings --HG-- branch : develop --- code/nel/src/gui/group_html.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index 7e56ce506..1693cb08a 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/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;