diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/script/context2d/context2d.cpp | 12 | ||||
| -rw-r--r-- | qtscript.pro | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.gypi | 1 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h | 67 |
5 files changed, 6 insertions, 78 deletions
diff --git a/.qmake.conf b/.qmake.conf index 657a682..87e921f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.10.0 diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 06979be..831e017 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -51,11 +51,7 @@ #include "context2d.h" #include <QVariant> - -#include <math.h> -static const double Q_PI = 3.14159265358979323846; // pi - -#define DEGREES(t) ((t) * 180.0 / Q_PI) +#include <qmath.h> #define qClamp(val, min, max) qMin(qMax(val, min), max) static QList<qreal> parseNumbersList(QString::const_iterator &itr) @@ -234,7 +230,7 @@ void Context2D::scale(qreal x, qreal y) void Context2D::rotate(qreal angle) { - m_state.matrix.rotate(DEGREES(angle)); + m_state.matrix.rotate(qRadiansToDegrees(angle)); m_state.flags |= DirtyTransformationMatrix; } @@ -583,8 +579,8 @@ void Context2D::arc(qreal xc, qreal yc, qreal radius, anticlockwise = !anticlockwise; //end hack - float sa = DEGREES(sar); - float ea = DEGREES(ear); + float sa = qRadiansToDegrees(sar); + float ea = qRadiansToDegrees(ear); double span = 0; diff --git a/qtscript.pro b/qtscript.pro index a6753e8..3fc1579 100644 --- a/qtscript.pro +++ b/qtscript.pro @@ -1,3 +1,3 @@ -requires(!integrity:!vxworks:!winrt) +requires(!integrity:!vxworks:!winrt:!tvos:!watchos) load(qt_parts) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.gypi b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.gypi index 24577da..92f2c89 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.gypi +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.gypi @@ -125,7 +125,6 @@ 'jit/JITStubs.h', 'jsc.cpp', 'os-win32/stdbool.h', - 'os-win32/stdint.h', 'parser/Lexer.cpp', 'parser/Lexer.h', 'parser/NodeConstructors.h', diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h deleted file mode 100644 index b5dff56..0000000 --- a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2005, 2006 Apple Computer, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -#ifndef STDINT_WIN32_H -#define STDINT_WIN32_H - -#include <wtf/Platform.h> - -/* This file emulates enough of stdint.h on Windows to make JavaScriptCore and WebCore - compile using MSVC which does not ship with the stdint.h header. */ - -#if !COMPILER(MSVC) -#error "This stdint.h file should only be compiled with MSVC" -#endif - -#include <limits.h> - -typedef unsigned char uint8_t; -typedef signed char int8_t; -typedef unsigned short uint16_t; -typedef short int16_t; -typedef unsigned int uint32_t; -typedef int int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#ifndef SIZE_MAX -#ifdef _WIN64 -#define SIZE_MAX _UI64_MAX -#else -#define SIZE_MAX _UI32_MAX -#endif -#endif -#endif - -#ifndef CASSERT -#define CASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]; -#endif - -CASSERT(sizeof(int8_t) == 1, int8_t_is_one_byte) -CASSERT(sizeof(uint8_t) == 1, uint8_t_is_one_byte) -CASSERT(sizeof(int16_t) == 2, int16_t_is_two_bytes) -CASSERT(sizeof(uint16_t) == 2, uint16_t_is_two_bytes) -CASSERT(sizeof(int32_t) == 4, int32_t_is_four_bytes) -CASSERT(sizeof(uint32_t) == 4, uint32_t_is_four_bytes) -CASSERT(sizeof(int64_t) == 8, int64_t_is_eight_bytes) -CASSERT(sizeof(uint64_t) == 8, uint64_t_is_eight_bytes) - -#endif |