Get rid of qt mode

Change-Id: Id8cc29a9a27f571f063b1cec51e534a3c762f2c6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

7 files changed, 3 insertions, 65 deletions

diff --git a/tests/auto/parser/data/ids2.scxml b/tests/auto/parser/data/ids2.scxml
index 228b487..5378fcb 100644
--- a/tests/auto/parser/data/ids2.scxml
+++ b/tests/auto/parser/data/ids2.scxml
@@ -28,7 +28,6 @@
 **
 ****************************************************************************/
 -->
-<!-- enable-qt-mode: yes -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" name="ids2">
     <state id="foo.bar"/>
     <state id="foo-bar"/>
diff --git a/tests/auto/parser/data/ids2.scxml.errors b/tests/auto/parser/data/ids2.scxml.errors
index 31d8e7c..3ca729e 100644
--- a/tests/auto/parser/data/ids2.scxml.errors
+++ b/tests/auto/parser/data/ids2.scxml.errors
@@ -1,3 +1 @@
-:/tst_parser/data/ids2.scxml:33:25: error: state name 'foo.bar' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/ids2.scxml:34:25: error: state name 'foo-bar' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/ids2.scxml:36:19: error: '1' is not a valid XML ID
+:/tst_parser/data/ids2.scxml:35:19: error: '1' is not a valid XML ID
diff --git a/tests/auto/parser/data/invalidRoot3.scxml b/tests/auto/parser/data/invalidRoot3.scxml
index e968b20..62dab58 100644
--- a/tests/auto/parser/data/invalidRoot3.scxml
+++ b/tests/auto/parser/data/invalidRoot3.scxml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- enable-qt-mode: yeq -->
 <scxma
     xmlns="http://www.w3.org/2005/07/scxml"
     version="1.0"
diff --git a/tests/auto/parser/data/invalidRoot3.scxml.errors b/tests/auto/parser/data/invalidRoot3.scxml.errors
index e61f590..dd1cf6c 100644
--- a/tests/auto/parser/data/invalidRoot3.scxml.errors
+++ b/tests/auto/parser/data/invalidRoot3.scxml.errors
@@ -1,3 +1,2 @@
-:/tst_parser/data/invalidRoot3.scxml:2:28: error: expected 'yes' or 'no' after enable-qt-mode in comment
-:/tst_parser/data/invalidRoot3.scxml:6:1: error: Unknown element scxma
-:/tst_parser/data/invalidRoot3.scxml:9:8: error: Missing root element
+:/tst_parser/data/invalidRoot3.scxml:5:1: error: Unknown element scxma
+:/tst_parser/data/invalidRoot3.scxml:8:8: error: Missing root element
diff --git a/tests/auto/parser/data/qtmode.scxml b/tests/auto/parser/data/qtmode.scxml
deleted file mode 100644
index c5df8b0..0000000
--- a/tests/auto/parser/data/qtmode.scxml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtScxml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
--->
-<!-- enable-qt-mode: yes -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       name="test1">
-    <state id="a">
-        <transition event="a"/>
-        <transition event="void"/>
-        <transition event="aChanged"/>
-        <transition event="finished"/>
-        <transition event="done.state.a"/>
-        <transition event="done.state.double"/>
-    </state>
-    <state id="int"/>
-    <state id="objectName"/>
-    <state id="foo"/>
-    <state id="fooChanged"/>
-</scxml>
diff --git a/tests/auto/parser/data/qtmode.scxml.errors b/tests/auto/parser/data/qtmode.scxml.errors
deleted file mode 100644
index ae365b9..0000000
--- a/tests/auto/parser/data/qtmode.scxml.errors
+++ /dev/null
@@ -1,9 +0,0 @@
-:/tst_parser/data/qtmode.scxml:35:31: error: event name 'a' collides with a state name 'a' in Qt mode
-:/tst_parser/data/qtmode.scxml:36:34: error: event name 'void' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:37:38: error: event name 'aChanged' collides with a state name 'a' in Qt mode
-:/tst_parser/data/qtmode.scxml:38:38: error: event name 'finished' is not a valid Qt identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:39:42: error: event name 'done.state.a' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:40:47: error: event name 'done.state.double' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:42:21: error: state name 'int' is not a valid C++ identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:43:28: error: state name 'objectName' is not a valid Qt identifier in Qt mode
-:/tst_parser/data/qtmode.scxml:45:28: error: state name 'fooChanged' collides with a state name 'foo' in Qt mode
diff --git a/tests/auto/parser/tst_parser.qrc b/tests/auto/parser/tst_parser.qrc
index 0c5f56b..8d133d2 100644
--- a/tests/auto/parser/tst_parser.qrc
+++ b/tests/auto/parser/tst_parser.qrc
@@ -48,8 +48,6 @@
         <file>data/prematureEndOfDocument1.scxml</file>
         <file>data/prematureEndOfDocument2.scxml.errors</file>
         <file>data/prematureEndOfDocument2.scxml</file>
-        <file>data/qtmode.scxml.errors</file>
-        <file>data/qtmode.scxml</file>
         <file>data/scxml1.scxml.errors</file>
         <file>data/scxml1.scxml</file>
         <file>data/scxml2.scxml.errors</file>