diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-15 15:58:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 17:18:22 +0200 |
commit | 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch) | |
tree | 2bf779aff001b7e9675f52ccb270a0041de06b62 /doc | |
parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) |
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'doc')
15 files changed, 15 insertions, 15 deletions
diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp index 5ef09aa9..aaa7f645 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "applicationdata.h" diff --git a/doc/src/snippets/declarative/qtbinding/context/main.cpp b/doc/src/snippets/declarative/qtbinding/context/main.cpp index 24f6e8ed..0f1cd090 100644 --- a/doc/src/snippets/declarative/qtbinding/context/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/context/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h index 1d3d9cc5..f071fc9f 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> //![start] class ImageViewer : public QDeclarativeItem diff --git a/doc/src/snippets/declarative/qtbinding/enums/main.cpp b/doc/src/snippets/declarative/qtbinding/enums/main.cpp index 028fe831..868c62fe 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/enums/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp index d8d277b2..dc288662 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "myclass.h" diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp index 8b5522c0..4894d36e 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/doc/src/snippets/declarative/qtbinding/loading/main.cpp index 2dd52b76..163b461b 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/loading/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> static void withComponent() { diff --git a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h index 713a5162..ce711435 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> class ImageViewer : public QDeclarativeItem { diff --git a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp index 51e6de59..bd389d78 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp index 485d8daa..e2a26d57 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "applicationdata.h" diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp index 8021a6e2..e7beaa8e 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h index 35858faf..c67f924d 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> //![start] class ImageViewer : public QDeclarativeItem diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp index 58318ad6..a0d41d6c 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp index bcd6c320..ef045cfe 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> //![0] int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp b/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp index 040c00c9..e48bf211 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtQuick1> +#include <QtDeclarative> int main(int argc, char *argv[]) { QApplication app(argc, argv); |