+++ /dev/null
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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, Nokia gives you certain additional
-** rights. These rights are described in the Nokia 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtQuick/QQuickView>
-#include <QtGui/QGuiApplication>
-
-int main(int argc, char *argv[])
-{
- QGuiApplication app(argc, argv);
-
- bool qtquick2 = true;
- for (int i = 1; i < app.arguments().size(); ++i) {
- const QString arg = app.arguments().at(i);
- if (arg == "-qtquick1") {
- qtquick2 = false;
- } else if (arg == "-qtquick2") {
- qtquick2 = true;
- } else {
- qWarning() << "Usage: " << app.arguments().at(0) << "[-qtquick1|-qtquick2]";
- return -1;
- }
- }
-
- if (qtquick2) {
- QQuickView *view = new QQuickView();
- view->setSource(QUrl::fromLocalFile("app/qtquick2.qml"));
- } else {
- qWarning("No suitable QtQuick1 implementation is available!");
- }
- return app.exec();
-}
#include <QHostAddress>
#include <QDebug>
#include <QThread>
+#include <QtCore/QLibraryInfo>
#include "../shared/debugutil_p.h"
+#include "../../../shared/util.h"
#define PORT 3772
#define STR_PORT "3772"
bool m_requestResult;
};
-class tst_QQmlInspector : public QObject
+class tst_QQmlInspector : public QQmlDataTest
{
Q_OBJECT
QQmlInspectorClient *m_client;
private slots:
- void initTestCase();
- void cleanupTestCase();
void init();
void cleanup();
emit responseReceived();
}
-void tst_QQmlInspector::initTestCase()
-{
-}
-
-void tst_QQmlInspector::cleanupTestCase()
-{
-}
-
void tst_QQmlInspector::init()
{
-#if defined(Q_OS_WIN)
- const QString executable = "app\\app.exe";
-#else
- const QString executable = "app/app";
-#endif
const QString argument = "-qmljsdebugger=port:"STR_PORT",block";
- m_process = new QQmlDebugProcess(executable);
- m_process->start(QStringList() << argument);
+ m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene");
+ m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
QVERIFY2(m_process->waitForSessionStart(),
"Could not launch application, or did not get 'Waiting for connection'.");