Added support for using custom application objects on S60.

With this patch, the application developer can use his own
CEikApplication, CEikDocument and CEikAppUi classes with Qt, by
deriving from QS60MainApplication, QSMainDocument and QS60MainAppUi,
respectively. He can then register a factory function in the
QApplication constructor to have his own objects created during the
framework initialization.

This patch also fixes some Qt code style issues.

RevBy:    Jason Barron
RevBy:    mread
RevBy:    Sami Merila
RevBy:    Shane Kearns

2 files changed, 137 insertions, 0 deletions

diff --git a/tests/auto/qs60mainapplication/qs60mainapplication.pro b/tests/auto/qs60mainapplication/qs60mainapplication.pro
new file mode 100644
index 0000000000..bbd6c3073a
--- /dev/null
+++ b/tests/auto/qs60mainapplication/qs60mainapplication.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qs60mainapplication.cpp
+
+symbian:LIBS += -lapparc -leikcore -lcone -lavkon
diff --git a/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp b/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
new file mode 100644
index 0000000000..78fcb869db
--- /dev/null
+++ b/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite 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$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QtGui/QS60MainApplication>
+#include <QtGui/QS60MainDocument>
+#include <QtGui/QS60MainAppUi>
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_QS60MainApplication : public QObject
+{
+    Q_OBJECT
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+private slots:
+    void customQS60MainApplication();
+};
+
+void tst_QS60MainApplication::initTestCase()
+{
+}
+
+void tst_QS60MainApplication::cleanupTestCase()
+{
+}
+
+void tst_QS60MainApplication::init()
+{
+}
+
+void tst_QS60MainApplication::cleanup()
+{
+}
+
+#ifdef Q_WS_S60
+bool appUiConstructed = false;
+
+class CustomMainAppUi : public QS60MainAppUi
+{
+public:
+    CustomMainAppUi()
+    {
+        appUiConstructed = true;
+    }
+};
+
+class CustomMainDocument : public QS60MainDocument
+{
+public:
+    CustomMainDocument(CEikApplication &eikApp)
+        : QS60MainDocument(eikApp)
+    {
+    }
+    CEikAppUi *CreateAppUiL()
+    {
+        return new (ELeave) CustomMainAppUi;
+    }
+};
+
+class CustomMainApplication : public QS60MainApplication
+{
+protected:
+    CApaDocument *CreateDocumentL()
+    {
+        return new (ELeave) CustomMainDocument(*this);
+    }
+};
+
+CApaApplication *factory()
+{
+    return new (ELeave) CustomMainApplication;
+}
+#endif // Q_WS_S60
+
+void tst_QS60MainApplication::customQS60MainApplication()
+{
+#ifndef Q_WS_S60
+    QSKIP("This is an S60-only test", SkipAll);
+#else
+    int argc = 1;
+    char *argv = "tst_qs60mainapplication";
+    QApplication app(factory, argc, &argv);
+    QVERIFY(appUiConstructed);
+#endif
+}
+
+QTEST_APPLESS_MAIN(tst_QS60MainApplication)
+#include "tst_qs60mainapplication.moc"