diff options
Diffstat (limited to 'examples/qml/cppextensions/referenceexamples/extended')
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/qml/cppextensions/referenceexamples/extended/extended.pro b/examples/qml/cppextensions/referenceexamples/extended/extended.pro index 3d9f59c470..206ea19c61 100644 --- a/examples/qml/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/qml/cppextensions/referenceexamples/extended/extended.pro @@ -1,11 +1,11 @@ -QT += declarative widgets +QT += qml widgets SOURCES += main.cpp \ lineedit.cpp HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/extended +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/extended sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/extending/extended +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/extending/extended INSTALLS += target sources diff --git a/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp index 8f7fd8aa93..a3b1d0d54e 100644 --- a/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp +++ b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include "lineedit.h" -#include <qdeclarative.h> +#include <qqml.h> LineEditExtension::LineEditExtension(QObject *object) : QObject(object), m_lineedit(static_cast<QLineEdit *>(object)) diff --git a/examples/qml/cppextensions/referenceexamples/extended/main.cpp b/examples/qml/cppextensions/referenceexamples/extended/main.cpp index 3c580396f2..de7c450169 100644 --- a/examples/qml/cppextensions/referenceexamples/extended/main.cpp +++ b/examples/qml/cppextensions/referenceexamples/extended/main.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ #include <QApplication> -#include <QDeclarativeEngine> -#include <QDeclarativeComponent> +#include <QQmlEngine> +#include <QQmlComponent> #include <QDebug> #include <QLineEdit> #include "lineedit.h" @@ -50,8 +50,8 @@ int main(int argc, char ** argv) qmlRegisterExtendedType<QLineEdit, LineEditExtension>("People", 1,0, "QLineEdit"); - QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); + QQmlEngine engine; + QQmlComponent component(&engine, QUrl("qrc:example.qml")); QLineEdit *edit = qobject_cast<QLineEdit *>(component.create()); if (edit) { |