summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordac <qt-info@nokia.com>2010-07-28 14:40:02 +1000
committerdac <qt-info@nokia.com>2010-07-28 14:40:02 +1000
commit9788bd3617efe3278312668032bda147050551b7 (patch)
tree7e26aea0e435cddec21297ca9b0755d2a7469b58
parent8210814717e2950e8fb552a608ecc7e3e8e7beff (diff)
More cleanup
-rw-r--r--libqtuitest/demowidgets_p.h100
-rw-r--r--libqtuitest/qtuitestwidgets.cpp1
-rw-r--r--qtuitest-host.pri7
3 files changed, 0 insertions, 108 deletions
diff --git a/libqtuitest/demowidgets_p.h b/libqtuitest/demowidgets_p.h
deleted file mode 100644
index 51ca0d0..0000000
--- a/libqtuitest/demowidgets_p.h
+++ /dev/null
@@ -1,100 +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 QtUiTest.
-**
-** $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 DEMOWIDGETS_P_H
-#define DEMOWIDGETS_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the QtUiTest API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QWidget>
-#include <QBasicTimer>
-
-class MouseClickDemoWidget : public QWidget
-{
- Q_OBJECT
-public:
- MouseClickDemoWidget();
-
- void start(const QPoint&,int);
- void stop();
-
-protected:
- void paintEvent(QPaintEvent*);
- void timerEvent(QTimerEvent*);
-
-private:
- QVector<QPoint> offsets;
- QRect bound;
- QPixmap pm;
- int tickCount;
- int pressTick;
- QBasicTimer pressTimer;
-};
-
-class MousePressDemoWidget : public QWidget
-{
- Q_OBJECT
-public:
- MousePressDemoWidget();
-
- void start(const QPoint&);
- void stop();
-
-protected:
- void paintEvent(QPaintEvent*);
- void timerEvent(QTimerEvent*);
-
-private:
- static QPixmap& pm();
- QBasicTimer pressTimer;
-};
-
-#endif
-
diff --git a/libqtuitest/qtuitestwidgets.cpp b/libqtuitest/qtuitestwidgets.cpp
index 45d4b3a..9d163ef 100644
--- a/libqtuitest/qtuitestwidgets.cpp
+++ b/libqtuitest/qtuitestwidgets.cpp
@@ -39,7 +39,6 @@
**
****************************************************************************/
-#include "demowidgets_p.h"
#include "qinputgenerator_p.h"
#include "qtuitestrecorder.h"
#include "qtuitestwidgetinterface.h"
diff --git a/qtuitest-host.pri b/qtuitest-host.pri
index 926de33..f12873e 100644
--- a/qtuitest-host.pri
+++ b/qtuitest-host.pri
@@ -31,21 +31,18 @@ SEMI_PRIVATE_HEADERS += \
$$QTUITEST_SRC/libqsystemtest/qtestverifydlg_p.h
HEADERS +=\
-# $$QTUITEST_SRC/libqsystemtest/gracefulquit.h \
$$QTUITEST_SRC/libqsystemtest/qabstracttest.h \
$$QTUITEST_SRC/libqsystemtest/qsystemtest.h \
$$QTUITEST_SRC/libqsystemtest/qtestide.h \
$$QTUITEST_SRC/libqsystemtest/testdevicecontrol.h
SOURCES +=\
- # $$QTUITEST_SRC/libqsystemtest/gracefulquit.cpp \
$$QTUITEST_SRC/libqsystemtest/qabstracttest.cpp \
$$QTUITEST_SRC/libqsystemtest/qtestremote.cpp \
$$QTUITEST_SRC/libqsystemtest/qtestverifydlg.cpp \
$$QTUITEST_SRC/libqsystemtest/qsystemtest.cpp \
$$QTUITEST_SRC/libqsystemtest/qsystemtest_p.cpp \
$$QTUITEST_SRC/libqsystemtest/qsystemtestmaster.cpp \
- $$QTUITEST_SRC/libqsystemtest/qtestide.cpp \
$$QTUITEST_SRC/libqsystemtest/testdevicecontrol.cpp
HEADERS*=$$SEMI_PRIVATE_HEADERS $$PRIVATE_HEADERS
@@ -53,14 +50,10 @@ HEADERS*=$$SEMI_PRIVATE_HEADERS $$PRIVATE_HEADERS
symbian {
TARGET.EPOCALLOWDLLDATA=1
TARGET.CAPABILITY += AllFiles ReadDeviceData ReadUserData SwEvent WriteUserData
- # SOURCES-=$$QTUITEST_SRC/libqsystemtest/gracefulquit.cpp
- # HEADERS-=$$QTUITEST_SRC/libqsystemtest/gracefulquit.h
LIBS+=-L$$OUT_PWD -lws32 -leuser -lcone
}
win32 {
- # SOURCES-=$$QTUITEST_SRC/libqsystemtest/gracefulquit.cpp
- # HEADERS-=$$QTUITEST_SRC/libqsystemtest/gracefulquit.h
!equals(QMAKE_CXX, "g++") {
DEFINES+=strcasecmp=_stricmp
}