summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-12-02 23:24:08 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-12-02 23:24:08 (GMT)
commit11baee94956f23ff76757040ab10fb3d632d5b42 (patch)
tree3cb9582c5f0f33c64df118e1fadbfcde50c0d8c6 /src/declarative/qml/parser
parent5247ee562f76a51b8a81735d7da709d1b9b63796 (diff)
downloadQt-11baee94956f23ff76757040ab10fb3d632d5b42.zip
Qt-11baee94956f23ff76757040ab10fb3d632d5b42.tar.gz
Qt-11baee94956f23ff76757040ab10fb3d632d5b42.tar.bz2
Undo most of 913dd563064e8047fe738fc9c79135adfb928977
It seems we're going to have to so a syncqt/configure in Qt modules.
Diffstat (limited to 'src/declarative/qml/parser')
-rw-r--r--src/declarative/qml/parser/qmljsast.cpp4
-rw-r--r--src/declarative/qml/parser/qmljsast_p.h4
-rw-r--r--src/declarative/qml/parser/qmljsastfwd_p.h2
-rw-r--r--src/declarative/qml/parser/qmljsastvisitor.cpp2
-rw-r--r--src/declarative/qml/parser/qmljsastvisitor_p.h4
-rw-r--r--src/declarative/qml/parser/qmljsengine_p.cpp6
-rw-r--r--src/declarative/qml/parser/qmljsengine_p.h4
-rw-r--r--src/declarative/qml/parser/qmljsgrammar.cpp2
-rw-r--r--src/declarative/qml/parser/qmljslexer.cpp8
-rw-r--r--src/declarative/qml/parser/qmljslexer_p.h2
-rw-r--r--src/declarative/qml/parser/qmljsmemorypool_p.h2
-rw-r--r--src/declarative/qml/parser/qmljsnodepool_p.h4
-rw-r--r--src/declarative/qml/parser/qmljsparser.cpp10
-rw-r--r--src/declarative/qml/parser/qmljsparser_p.h8
14 files changed, 31 insertions, 31 deletions
diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
index 6986bd2..81b0649 100644
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ b/src/declarative/qml/parser/qmljsast.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qmljsast_p.h"
-#include "qmljsastvisitor_p.h"
+#include <private/qmljsast_p.h>
+#include <private/qmljsastvisitor_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
index 388bc12..d3ba0e4 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -53,8 +53,8 @@
// We mean it.
//
-#include "qmljsastvisitor_p.h"
-#include "qmljsglobal_p.h"
+#include <private/qmljsastvisitor_p.h>
+#include <private/qmljsglobal_p.h>
#include <QtCore/QString>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h
index b558a23..b485138 100644
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ b/src/declarative/qml/parser/qmljsastfwd_p.h
@@ -43,7 +43,7 @@
#define QMLJSAST_FWD_P_H
#include <QtCore/qglobal.h>
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
//
// W A R N I N G
diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp
index 1290c89..089fe76 100644
--- a/src/declarative/qml/parser/qmljsastvisitor.cpp
+++ b/src/declarative/qml/parser/qmljsastvisitor.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qmljsastvisitor_p.h"
+#include <private/qmljsastvisitor_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h
index 7db84b0..cb76b3a 100644
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ b/src/declarative/qml/parser/qmljsastvisitor_p.h
@@ -53,8 +53,8 @@
// We mean it.
//
-#include "qmljsastfwd_p.h"
-#include "qmljsglobal_p.h"
+#include <private/qmljsastfwd_p.h>
+#include <private/qmljsglobal_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp
index cee90a3..ab317aa 100644
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ b/src/declarative/qml/parser/qmljsengine_p.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "qmljsglobal_p.h"
-#include "qmljsengine_p.h"
-#include "qmljsnodepool_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsengine_p.h>
+#include <private/qmljsnodepool_p.h>
#include <qnumeric.h>
#include <QHash>
diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h
index a60c515..2fd0421 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -56,8 +56,8 @@
#include <QString>
#include <QSet>
-#include "qmljsglobal_p.h"
-#include "qmljsastfwd_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsastfwd_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index b8c6560..9ad61e6 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -40,7 +40,7 @@
**
****************************************************************************/
-#include "qmljsgrammar_p.h"
+#include <private/qmljsgrammar_p.h>
const char *const QmlJSGrammar::spell [] = {
"end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue",
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
index d316f93..2edd553 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -43,10 +43,10 @@
#include "config.h"
#endif
-#include "qmljsglobal_p.h"
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsgrammar_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsengine_p.h>
+#include <private/qmljslexer_p.h>
+#include <private/qmljsgrammar_p.h>
#include <QtGui/qapplication.h>
diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h
index f499750..96c8921 100644
--- a/src/declarative/qml/parser/qmljslexer_p.h
+++ b/src/declarative/qml/parser/qmljslexer_p.h
@@ -55,7 +55,7 @@
#include <QtCore/QString>
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index 24a2145..ca60ef1 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -57,7 +57,7 @@
#include <QtCore/qshareddata.h>
#include <string.h>
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index ca4d729..573a947 100644
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ b/src/declarative/qml/parser/qmljsnodepool_p.h
@@ -56,8 +56,8 @@
#include <QtCore/QHash>
#include <QtCore/QString>
-#include "qmljsglobal_p.h"
-#include "qmljsmemorypool_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsmemorypool_p.h>
QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 453503b..472f67e 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -46,14 +46,14 @@
#include <string.h>
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsast_p.h"
-#include "qmljsnodepool_p.h"
+#include <private/qmljsengine_p.h>
+#include <private/qmljslexer_p.h>
+#include <private/qmljsast_p.h>
+#include <private/qmljsnodepool_p.h>
-#include "qmljsparser_p.h"
+#include <private/qmljsparser_p.h>
#include <QVarLengthArray>
//
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 7fad58a..aab6c7e 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -60,10 +60,10 @@
#ifndef QMLJSPARSER_P_H
#define QMLJSPARSER_P_H
-#include "qmljsglobal_p.h"
-#include "qmljsgrammar_p.h"
-#include "qmljsast_p.h"
-#include "qmljsengine_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsgrammar_p.h>
+#include <private/qmljsast_p.h>
+#include <private/qmljsengine_p.h>
#include <QtCore/QList>
#include <QtCore/QString>