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 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "performancetest.h"
 
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
-
-    PerformanceTest mw;
-    a.showMainWidget( &mw );
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PerformanceTest> )
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 @@
-Files: bin/performance apps/Applications/performance.desktop
+Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop
 Priority: optional
 Section: opie/other
 Maintainer: Trolltech (www.trolltech.com)
 Architecture: $CPU_ARCH
 Arch: $DEVICE_ARCH
 Version: $QPE_VERSION-10
-Depends: qpe-libqtopia
+Depends: opie-taskbar
 Description: Graphics performance tester
  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 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-#DESTDIR    = $(QPEDIR)/bin
+CONFIG    += qt quick-app
 HEADERS   = performancetest.h
 SOURCES   = main.cpp performancetest.cpp
 INTERFACES  = performancetestbase.ui
 TARGET    = performance
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lqte
 
 include ( $(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 @@
 
 #include "performancetestbase.h"
 
 class PerformanceTest : public PerformanceTestBase
 {
     Q_OBJECT
 public:
     PerformanceTest( QWidget *parent=0, const char *name=0, WFlags fl=0 );
+    static QString appName() { return QString::fromLatin1("performance"); }
 
 protected slots:
     void testClicked( int );
     void doTest();
 
 private:
     QWidget *testWidget;
     QArray<bool> enabledTests;
 };