summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-27 20:20:24 (UTC)
committer mickeyl <mickeyl>2003-10-27 20:20:24 (UTC)
commit651d29249946e7221fc85580453750d9e4be4fb0 (patch) (side-by-side diff)
treec42b13795bee233df19233245257bedf9a7afe10
parentb367c7a9a97082419832c62d879c1ed2c80b8249 (diff)
downloadopie-651d29249946e7221fc85580453750d9e4be4fb0.zip
opie-651d29249946e7221fc85580453750d9e4be4fb0.tar.gz
opie-651d29249946e7221fc85580453750d9e4be4fb0.tar.bz2
merge noncore/mail/*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/mail.pro4
-rw-r--r--noncore/unsupported/mail2/main.cpp9
-rw-r--r--noncore/unsupported/mail2/mainwindow.h1
3 files changed, 4 insertions, 10 deletions
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 0c1a1fb..f521178 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -1,5 +1,4 @@
-TEMPLATE = app
-CONFIG += qt warn_on debug
+CONFIG += qt warn_on debug quick-app
#CONFIG += qt warn_on release
HEADERS = accounteditor.h \
addresspicker.h \
@@ -43,7 +42,6 @@ INTERFACES = accounteditorbase.ui \
INCLUDEPATH += $(OPIEDIR)/include libmail
LIBS += -lmail -lqpe -lopie
TARGET = mail
-DESTDIR = $(OPIEDIR)/bin
TRANSLATIONS = ../../i18n/de/mail.ts \
../../i18n/nl/mail.ts \
diff --git a/noncore/unsupported/mail2/main.cpp b/noncore/unsupported/mail2/main.cpp
index ddacf3d..a11b4e2 100644
--- a/noncore/unsupported/mail2/main.cpp
+++ b/noncore/unsupported/mail2/main.cpp
@@ -2,13 +2,8 @@
#include "mainwindow.h"
-int main(int argc, char *argv[])
-{
- QPEApplication app(argc, argv);
+#include <opie/oapplicationfactory.h>
- MainWindow mw;
- app.showMainWidget(&mw);
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
- return app.exec();
-}
diff --git a/noncore/unsupported/mail2/mainwindow.h b/noncore/unsupported/mail2/mainwindow.h
index 1ed0559..4cdd03d 100644
--- a/noncore/unsupported/mail2/mainwindow.h
+++ b/noncore/unsupported/mail2/mainwindow.h
@@ -13,6 +13,7 @@ class MainWindow : public MainWindowBase
Q_OBJECT
public:
+ static QString appName() { return QString::fromLatin1("mail"); }
MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
protected slots: