diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
| commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
| tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /examples/quick/quickwidgets | |
| parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
| parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'examples/quick/quickwidgets')
4 files changed, 8 insertions, 4 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp index 6ebf36c454..850ecd147b 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp +++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp @@ -86,8 +86,6 @@ MainWindow::MainWindow(bool transparency, bool noRenderAlpha) m_labelStatus = new QLabel; layout->addWidget(m_labelStatus); - qmlRegisterTypesAndRevisions<FbItem>("fbitem", 1); - QWidget *quickContainer = new QWidget; layout->addWidget(quickContainer); layout->setStretchFactor(quickContainer, 8); diff --git a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro index 80216da346..7809c20b3a 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro +++ b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro @@ -1,6 +1,10 @@ TEMPLATE = app TARGET = qquickviewcomparison +CONFIG += qmltypes +QML_IMPORT_NAME = fbitem +QML_IMPORT_MAJOR_VERSION = 1 + QT += quick widgets quickwidgets SOURCES += main.cpp \ diff --git a/examples/quick/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp index 541f543f07..f28b2f1443 100644 --- a/examples/quick/quickwidgets/quickwidget/main.cpp +++ b/examples/quick/quickwidgets/quickwidget/main.cpp @@ -214,8 +214,6 @@ int main(int argc, char **argv) optMultipleSample = parser.isSet(multipleSampleOption); optCoreProfile = parser.isSet(coreProfileOption); - qmlRegisterTypesAndRevisions<FbItem>("QuickWidgetExample", 1); - MainWindow mainWindow; mainWindow.show(); diff --git a/examples/quick/quickwidgets/quickwidget/quickwidget.pro b/examples/quick/quickwidgets/quickwidget/quickwidget.pro index 5be006f7fa..b824c520f5 100644 --- a/examples/quick/quickwidgets/quickwidget/quickwidget.pro +++ b/examples/quick/quickwidgets/quickwidget/quickwidget.pro @@ -3,6 +3,10 @@ QT += core gui quick widgets quickwidgets TARGET = quickwidget TEMPLATE = app +CONFIG += qmltypes +QML_IMPORT_NAME = QuickWidgetExample +QML_IMPORT_MAJOR_VERSION = 1 + SOURCES += main.cpp fbitem.cpp HEADERS += fbitem.h |