summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp17
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/API/OpaqueJSString.h4
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp4
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h14
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp4
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp8
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h4
-rw-r--r--src/plugins/script/qtdbus/main.cpp6
-rw-r--r--src/script/parser/qscriptast_p.h2
-rw-r--r--src/script/parser/qscriptlexer_p.h2
-rw-r--r--tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp2
14 files changed, 45 insertions, 28 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 3762dad..7a7d5ac 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.11.3
+MODULE_VERSION = 5.12.0
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp
index 8e236e4..fc337ef 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp
@@ -67,18 +67,18 @@ void JSStringRelease(JSStringRef string)
size_t JSStringGetLength(JSStringRef string)
{
- return string->length();
+ return string ? string->length() : 0;
}
const JSChar* JSStringGetCharactersPtr(JSStringRef string)
{
- return string->characters();
+ return string ? string->characters() : nullptr;
}
size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
{
// Any UTF8 character > 3 bytes encodes as a UTF16 surrogate pair.
- return string->length() * 3 + 1; // + 1 for terminating '\0'
+ return string ? string->length() * 3 + 1 : 1; // + 1 for terminating '\0'
}
size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize)
@@ -87,8 +87,11 @@ size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSiz
return 0;
char* p = buffer;
- const UChar* d = string->characters();
- ConversionResult result = convertUTF16ToUTF8(&d, d + string->length(), &p, p + bufferSize - 1, true);
+ ConversionResult result = conversionOK;
+ if (string) {
+ const UChar* d = string->characters();
+ result = convertUTF16ToUTF8(&d, d + string->length(), &p, p + bufferSize - 1, true);
+ }
*p++ = '\0';
if (result != conversionOK && result != targetExhausted)
return 0;
@@ -98,6 +101,10 @@ size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSiz
bool JSStringIsEqual(JSStringRef a, JSStringRef b)
{
+ if (!a)
+ return (!b || b->length() == 0);
+ if (!b)
+ return (!a || a->length() == 0);
unsigned len = a->length();
return len == b->length() && 0 == memcmp(a->characters(), b->characters(), len * sizeof(UChar));
}
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/OpaqueJSString.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/OpaqueJSString.h
index 473c815..6aa7b99 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/API/OpaqueJSString.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/OpaqueJSString.h
@@ -47,8 +47,8 @@ struct OpaqueJSString : public ThreadSafeShared<OpaqueJSString> {
static PassRefPtr<OpaqueJSString> create(const JSC::UString&);
- UChar* characters() { return this ? m_characters : 0; }
- unsigned length() { return this ? m_length : 0; }
+ UChar* characters() { return m_characters; }
+ unsigned length() { return m_length; }
JSC::UString ustring() const;
JSC::Identifier identifier(JSC::JSGlobalData*) const;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp
index 252fb96..30ea5aa 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jsc.cpp
@@ -61,8 +61,8 @@
#endif
#if PLATFORM(QT)
-#include <QCoreApplication>
-#include <QDateTime>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdatetime.h>
#endif
using namespace JSC;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 00caa6d..96942c7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -397,6 +397,16 @@
#endif
#endif /* __mips__ */
+/* CPU(RISCV64) - RISC-V 64-bit */
+#if defined(__riscv) && __riscv_xlen == 64
+#define WTF_CPU_RISCV64 1
+#endif
+
+/* CPU(RISCV32) - RISC-V 32-bit */
+#if defined(__riscv) && __riscv_xlen == 32
+#define WTF_CPU_RISCV32 1
+#endif
+
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
virtual memory, not to choose a GUI toolkit ==== */
@@ -948,9 +958,9 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
#define WTF_USE_JSVALUE64 1
-#elif CPU(ARM) || CPU(PPC64)
+#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
#define WTF_USE_JSVALUE32 1
#elif OS(WINDOWS) && COMPILER(MINGW)
/* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
index 3f0e764..4485ef7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h
@@ -46,7 +46,7 @@
#if USE(PTHREADS)
#include <pthread.h>
#elif PLATFORM(QT)
-#include <QThreadStorage>
+#include <QtCore/qthreadstorage.h>
#elif OS(WINDOWS)
#include <windows.h>
#endif
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
index 83eca64..1093a9f 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Vector.h
@@ -29,7 +29,7 @@
#include <utility>
#if PLATFORM(QT)
-#include <QDataStream>
+#include <QtCore/qdatastream.h>
#endif
namespace WTF {
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp
index 744d3d5..2326ace 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp
@@ -31,8 +31,8 @@
#include "config.h"
#include "MainThread.h"
-#include <QtCore/QObject>
-#include <QtCore/QCoreApplication>
+#include <QtCore/qobject.h>
+#include <QtCore/qcoreapplication.h>
namespace WTF {
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
index 3e5aa59..71de552 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/ThreadingQt.cpp
@@ -36,10 +36,10 @@
#include "MainThread.h"
#include "RandomNumberSeed.h"
-#include <QCoreApplication>
-#include <QMutex>
-#include <QThread>
-#include <QWaitCondition>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qthread.h>
+#include <QtCore/qwaitcondition.h>
namespace WTF {
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
index eeadfea..d92ee19 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
@@ -23,8 +23,8 @@
#ifndef WTF_UNICODE_QT4_H
#define WTF_UNICODE_QT4_H
-#include <QChar>
-#include <QString>
+#include <QtCore/qchar.h>
+#include <QtCore/qstring.h>
#include <config.h>
diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp
index 52d9262..5b8121f 100644
--- a/src/plugins/script/qtdbus/main.cpp
+++ b/src/plugins/script/qtdbus/main.cpp
@@ -38,9 +38,9 @@
****************************************************************************/
#include "main.h"
-#include <QDebug>
-#include <QMetaMethod>
-#include <QScriptExtensionPlugin>
+#include <QtCore/qdebug.h>
+#include <QtCore/qmetamethod.h>
+#include <QtScript/qscriptextensionplugin.h>
#ifndef QT_NO_DBUS
diff --git a/src/script/parser/qscriptast_p.h b/src/script/parser/qscriptast_p.h
index a089d1d..062cb39 100644
--- a/src/script/parser/qscriptast_p.h
+++ b/src/script/parser/qscriptast_p.h
@@ -35,7 +35,7 @@
// We mean it.
//
-#include <QtCore/QString>
+#include <QtCore/qstring.h>
#include "qscriptastvisitor_p.h"
diff --git a/src/script/parser/qscriptlexer_p.h b/src/script/parser/qscriptlexer_p.h
index 4b7429b..72e1a84 100644
--- a/src/script/parser/qscriptlexer_p.h
+++ b/src/script/parser/qscriptlexer_p.h
@@ -35,7 +35,7 @@
// We mean it.
//
-#include <QtCore/QString>
+#include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
index beeb7d8..2161bec 100644
--- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
+++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
@@ -833,7 +833,7 @@ void tst_QScriptEngineDebugger::engineDeleted()
debugger->attachTo(engine);
debugger->standardWindow()->show();
- QTest::qWaitForWindowShown(debugger->standardWindow());
+ QTest::qWaitForWindowExposed(debugger->standardWindow());
QSignalSpy destroyedSpy(engine, SIGNAL(destroyed()));
engine->deleteLater();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 18:36:05 +0000