From a6b1f314e2a7a47b80acbbc5cc217b5b73adde70 Mon Sep 17 00:00:00 2001
From: Skycoder42 <Skycoder42@users.noreply.github.com>
Date: Sat, 14 Jul 2018 22:51:02 +0200
Subject: [PATCH] CI fixes

---
 src/mvvmcore/message.cpp          | 5 ++---
 tools/settingsgenerator/qpmx.json | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mvvmcore/message.cpp b/src/mvvmcore/message.cpp
index 9cec27c..8fd3b24 100644
--- a/src/mvvmcore/message.cpp
+++ b/src/mvvmcore/message.cpp
@@ -3,8 +3,7 @@
 #include "coreapp.h"
 #include "qtmvvm_logging_p.h"
 
-#include <cmath>
-
+#include <QtCore/QtMath>
 #include <QtGui/QGuiApplication>
 
 using namespace QtMvvm;
@@ -399,7 +398,7 @@ void ProgressControl::setProgress(int progress)
 void ProgressControl::setProgress(double progressPercent)
 {
 	Q_ASSERT_X(progressPercent >= 0.0 && progressPercent <= 1.0, Q_FUNC_INFO, "progressPercent must be in the range [0.0,1.0]");
-	setProgress(static_cast<int>(std::round((d->maximum - d->minimum) * progressPercent + d->minimum)));
+	setProgress(static_cast<int>(qRound((d->maximum - d->minimum) * progressPercent + d->minimum)));
 }
 
 // ------------- Private Implementation -------------
diff --git a/tools/settingsgenerator/qpmx.json b/tools/settingsgenerator/qpmx.json
index 972924c..3b2e020 100644
--- a/tools/settingsgenerator/qpmx.json
+++ b/tools/settingsgenerator/qpmx.json
@@ -3,7 +3,7 @@
         {
             "package": "de.skycoder42.qxmlcodegen",
             "provider": "qpm",
-            "version": "1.1.2"
+            "version": "1.1.3"
         }
     ],
     "license": {