diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-04 16:40:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-08 08:22:31 +0000 |
| commit | f6f5687032bd6451e52c9ef221fb6a8a5b194389 (patch) | |
| tree | dcd068f83a64bfe80c1b0bc6035068c7336fe71d /src/qml | |
| parent | 245f9534ea01a8f482444b581ff995721b865751 (diff) | |
More porting of declarative modules
Change-Id: Ibe6d87998af1209518af87117b79778136110786
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4regexp.cpp | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 32595a1759..077373f9ac 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_module(Qml + PLUGIN_TYPES qmltooling SOURCES ../3rdparty/llvm/include/llvm-c/DataTypes.h ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h @@ -593,3 +594,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints) add_qt_docs( doc/qtqml.qdocconf ) + diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index b91862edd4..6a750161f4 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_module(Qml + PLUGIN_TYPES qmltooling SOURCES ../3rdparty/llvm/include/llvm-c/DataTypes.h ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h @@ -600,3 +601,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints) add_qt_docs( doc/qtqml.qdocconf ) + diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index 4ed1dbd5aa..9e77061882 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -74,6 +74,7 @@ DEFINE_MANAGED_VTABLE(RegExp); uint RegExp::match(const QString &string, int start, uint *matchOffsets) { static const uint offsetJITFail = std::numeric_limits<unsigned>::max() - 1; + Q_UNUSED(offsetJITFail); if (!isValid()) return JSC::Yarr::offsetNoMatch; |