summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-09-30 05:37:35 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-09-30 05:44:05 (GMT)
commit39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0 (patch)
tree6c87130cfaa475f3cef151eb1ac12e4dfed5fa62
parent91501cc9b542de644cd70098a6bc5ff738cdeb49 (diff)
downloadQt-39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0.zip
Qt-39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0.tar.gz
Qt-39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0.tar.bz2
Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
This reverts commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135.
-rw-r--r--tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h92
-rw-r--r--tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro3
-rw-r--r--tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp2
3 files changed, 2 insertions, 95 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h b/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
deleted file mode 100644
index 0cadbe5..0000000
--- a/tests/auto/declarative/qdeclarativedebugservice/private_headers/qdeclarativedebugservice_p.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** 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, 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEDEBUGSERVICE_H
-#define QDECLARATIVEDEBUGSERVICE_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDeclarativeDebugServicePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QDeclarativeDebugService)
- Q_DISABLE_COPY(QDeclarativeDebugService)
-
-public:
- explicit QDeclarativeDebugService(const QString &, QObject *parent = 0);
- ~QDeclarativeDebugService();
-
- QString name() const;
-
- enum Status { NotConnected, Unavailable, Enabled };
- Status status() const;
-
- void sendMessage(const QByteArray &);
-
- static int idForObject(QObject *);
- static QObject *objectForId(int);
-
- static QString objectToString(QObject *obj);
-
- static bool isDebuggingEnabled();
- static bool hasDebuggingClient();
-
-protected:
- virtual void statusChanged(Status);
- virtual void messageReceived(const QByteArray &);
-
-private:
- friend class QDeclarativeDebugServer;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEDEBUGSERVICE_H
-
diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
index 83bcadb..a62e148 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
+++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
@@ -2,8 +2,7 @@ load(qttest_p4)
contains(QT_CONFIG,declarative): QT += network declarative
macx:CONFIG -= app_bundle
-HEADERS += ../shared/debugutil_p.h \
- private_headers/qdeclarativedebugservice_p.h
+HEADERS += ../shared/debugutil_p.h
SOURCES += tst_qdeclarativedebugservice.cpp \
../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index 945823a..bce4713 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -50,8 +50,8 @@
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativeenginedebug_p.h>
#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
-#include "private_headers/qdeclarativedebugservice_p.h"
#include "../../../shared/util.h"
#include "../shared/debugutil_p.h"