aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4regexpobject_p.h
diff options
context:
space:
mode:
authorOleg Shparber <trollixx@gmail.com>2014-11-20 22:16:53 -0800
committerOleg Shparber <trollixx@gmail.com>2014-11-21 19:19:19 +0100
commit2cb6d1bf32e017026f618dcfdbef3980f5363656 (patch)
treee2429bfd2b5030aab2e3c33e74f6158cbccab7e9 /src/qml/jsruntime/qv4regexpobject_p.h
parentd6140dbfe8ee700c20c1bb9811b4d15a30a83767 (diff)
Make QV4::RegExpObject header independent from masm headers
Also remove pointless uint32_t for uint values and replace a few inconsistent uint16_t uses with quint16. MSVC was using uintN_t defined in masm headers instead of cstdint, so this change eliminates such situation. Change-Id: Ibd7dd50fc047dcdc78e057299883311a24dd3960 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject_p.h')
-rw-r--r--src/qml/jsruntime/qv4regexpobject_p.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index cd1cf4f578..febd0dd7b2 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -43,7 +43,6 @@
#include "qv4managed_p.h"
#include "qv4property_p.h"
#include "qv4objectiterator_p.h"
-#include "qv4regexp_p.h"
#include <QtCore/QString>
#include <QtCore/QHash>