diff options
author | Aurindam Jana <aurindam.jana@digia.com> | 2012-11-22 17:29:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 17:03:35 +0100 |
commit | 70579cf5f1b82460443b764aef1f2d2b23732acd (patch) | |
tree | f1ebdf69b9346dae6b3daef348d85cf5215fe052 /tests/auto/declarative/qdeclarativedebugobservermode/app | |
parent | ed0616b199dde58c8c87097dce31128dd0bfb5b8 (diff) |
QtQuick1: Fix ObserverMode
Although ObserverMode was enabled, the messages to the plugin
were not delivered and hence the feature did not work.
Change-Id: I58ec83a4ee727b32833c011a4942cde0cd6a02c8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativedebugobservermode/app')
4 files changed, 127 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/app/app.pro b/tests/auto/declarative/qdeclarativedebugobservermode/app/app.pro new file mode 100644 index 00000000..3c7ed484 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugobservermode/app/app.pro @@ -0,0 +1,18 @@ +TEMPLATE = app + +QT += declarative declarative-private gui widgets +CONFIG += declarative_debug + +CONFIG += console +CONFIG -= app_bundle + +DESTDIR = ./ + +INSTALLS = + +SOURCES += main.cpp \ + mainwindow.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +HEADERS += \ + mainwindow.h diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp b/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp new file mode 100644 index 00000000..7769e3ac --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QApplication> +#include <QDebug> +#include <QDeclarativeComponent> +#include <QDeclarativeEngine> +#include <QStringList> +#include <QtDeclarative/private/qdeclarativedebugservice_p.h> + +#include "mainwindow.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + const QUrl path = QUrl::fromLocalFile(app.arguments().last()); + + MainWindow window; + + if (!window.loadQML(path)) { + return -1; + } + return app.exec(); +} diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.cpp b/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.cpp new file mode 100644 index 00000000..d6399d81 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.cpp @@ -0,0 +1,27 @@ +#include "mainwindow.h" + +#include <QDeclarativeError> +#include <QDebug> + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent) +{ +} + +MainWindow::~MainWindow() +{ + delete m_view; +} + +bool MainWindow::loadQML(const QUrl &source) +{ + m_view = new QDeclarativeView(source, this); + if (m_view->status() == QDeclarativeView::Error) { + QList<QDeclarativeError> errors = m_view->errors(); + foreach (const QDeclarativeError &error, errors) { + qWarning() << error.toString(); + } + return false; + } + return true; +} diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.h b/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.h new file mode 100644 index 00000000..4eeba4ca --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugobservermode/app/mainwindow.h @@ -0,0 +1,19 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include <QMainWindow> +#include <QDeclarativeView> + +class MainWindow : public QMainWindow +{ + Q_OBJECT +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); + bool loadQML(const QUrl &source); + +private: + QDeclarativeView *m_view; +}; + +#endif // MAINWINDOW_H |