summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--development/performance/main.cpp12
-rw-r--r--development/performance/opie-performance.control4
-rw-r--r--development/performance/performance.pro4
-rw-r--r--development/performance/performancetest.h1
4 files changed, 6 insertions, 15 deletions
diff --git a/development/performance/main.cpp b/development/performance/main.cpp
index 8802777..41db9e9 100644
--- a/development/performance/main.cpp
+++ b/development/performance/main.cpp
@@ -1,33 +1,25 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "performancetest.h" 21#include "performancetest.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <opie2/oapplicationfactory.h>
24 24
25int main( int argc, char ** argv ) 25OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PerformanceTest> )
26{
27 QPEApplication a( argc, argv );
28
29 PerformanceTest mw;
30 a.showMainWidget( &mw );
31
32 return a.exec();
33}
diff --git a/development/performance/opie-performance.control b/development/performance/opie-performance.control
index 299fda2..89157f9 100644
--- a/development/performance/opie-performance.control
+++ b/development/performance/opie-performance.control
@@ -1,10 +1,10 @@
1Files: bin/performance apps/Applications/performance.desktop 1Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop
2Priority: optional 2Priority: optional
3Section: opie/other 3Section: opie/other
4Maintainer: Trolltech (www.trolltech.com) 4Maintainer: Trolltech (www.trolltech.com)
5Architecture: $CPU_ARCH 5Architecture: $CPU_ARCH
6Arch: $DEVICE_ARCH 6Arch: $DEVICE_ARCH
7Version: $QPE_VERSION-10 7Version: $QPE_VERSION-10
8Depends: qpe-libqtopia 8Depends: opie-taskbar
9Description: Graphics performance tester 9Description: Graphics performance tester
10 Graphics performance tester for Qtopia. 10 Graphics performance tester for Qtopia.
diff --git a/development/performance/performance.pro b/development/performance/performance.pro
index ab3a51a..a7fc512 100644
--- a/development/performance/performance.pro
+++ b/development/performance/performance.pro
@@ -1,12 +1,10 @@
1TEMPLATE = app 1CONFIG += qt quick-app
2CONFIG += qt warn_on release
3#DESTDIR = $(QPEDIR)/bin
4HEADERS = performancetest.h 2HEADERS = performancetest.h
5SOURCES = main.cpp performancetest.cpp 3SOURCES = main.cpp performancetest.cpp
6INTERFACES = performancetestbase.ui 4INTERFACES = performancetestbase.ui
7TARGET = performance 5TARGET = performance
8INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -lqte 8LIBS += -lqpe -lqte
11 9
12include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )
diff --git a/development/performance/performancetest.h b/development/performance/performancetest.h
index c0a80c4..a747c3c 100644
--- a/development/performance/performancetest.h
+++ b/development/performance/performancetest.h
@@ -1,18 +1,19 @@
1 1
2#include "performancetestbase.h" 2#include "performancetestbase.h"
3 3
4class PerformanceTest : public PerformanceTestBase 4class PerformanceTest : public PerformanceTestBase
5{ 5{
6 Q_OBJECT 6 Q_OBJECT
7public: 7public:
8 PerformanceTest( QWidget *parent=0, const char *name=0, WFlags fl=0 ); 8 PerformanceTest( QWidget *parent=0, const char *name=0, WFlags fl=0 );
9 static QString appName() { return QString::fromLatin1("performance"); }
9 10
10protected slots: 11protected slots:
11 void testClicked( int ); 12 void testClicked( int );
12 void doTest(); 13 void doTest();
13 14
14private: 15private:
15 QWidget *testWidget; 16 QWidget *testWidget;
16 QArray<bool> enabledTests; 17 QArray<bool> enabledTests;
17}; 18};
18 19