Change error messages to reflect new module terminology

Previously, modules which registered types into a protected type
namespace were known as "strict" modules; now they are known as
"identified" modules.

This commit also adds a unit test to ensure that the module identifier
directive is the first command in the qmldir file.

Change-Id: I90e9d2c5b51ecb2b9d058c9fe9d9310fd3cd4f45
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index 82616ffa8a..3427a5f760 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -164,28 +164,28 @@ void tst_qqmldirparser::parse_data()
 
     QTest::newRow("incomplete-module")
         << "incomplete-module/qmldir"
-        << (QStringList() << "qmldir:1: module directive requires one argument, but 0 were provided")
+        << (QStringList() << "qmldir:1: module identifier directive requires one argument, but 0 were provided")
         << QStringList()
         << QStringList()
         << QStringList();
 
     QTest::newRow("excessive-module")
         << "excessive-module/qmldir"
-        << (QStringList() << "qmldir:1: module directive requires one argument, but 2 were provided")
+        << (QStringList() << "qmldir:1: module identifier directive requires one argument, but 2 were provided")
         << QStringList()
         << QStringList()
         << QStringList();
 
     QTest::newRow("repeated-module")
         << "repeated-module/qmldir"
-        << (QStringList() << "qmldir:2: only one module directive may be defined in a qmldir file")
+        << (QStringList() << "qmldir:2: only one module identifier directive may be defined in a qmldir file")
         << QStringList()
         << QStringList()
         << QStringList();
 
     QTest::newRow("non-first-module")
         << "non-first-module/qmldir"
-        << (QStringList() << "qmldir:2: module directive must be the first directive in a qmldir file")
+        << (QStringList() << "qmldir:2: module identifier directive must be the first directive in a qmldir file")
         << (QStringList() << "foo|")
         << QStringList()
         << QStringList();