author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/citytime | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
-rw-r--r-- | core/settings/citytime/citytime.h | 2 | ||||
-rw-r--r-- | core/settings/citytime/citytime.pro | 8 | ||||
-rw-r--r-- | core/settings/citytime/main.cpp | 9 |
3 files changed, 6 insertions, 13 deletions
diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h index 63e3102..cc3d487 100644 --- a/core/settings/citytime/citytime.h +++ b/core/settings/citytime/citytime.h | |||
@@ -38,3 +38,3 @@ public: | |||
38 | ~CityTime(); | 38 | ~CityTime(); |
39 | 39 | static QString appName() { return QString::fromLatin1("citytime"); } | |
40 | public slots: | 40 | public slots: |
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index c7f4d08..402bcf6 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro | |||
@@ -1,8 +1,4 @@ | |||
1 | CONFIG += qt warn_on release | 1 | CONFIG += qt warn_on release quick-app |
2 | TEMPLATE = app | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | #INTERFACES = citytimebase.ui | ||
5 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h | 2 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h |
6 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp | 3 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp |
7 | TARGET = citytime | ||
8 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
@@ -11,2 +7,4 @@ LIBS += -lqpe | |||
11 | 7 | ||
8 | TARGET= citytime | ||
9 | |||
12 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ |
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index e8664c6..69bfe44 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp | |||
@@ -22,9 +22,4 @@ | |||
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <opie/oapplicationfactory.h> | ||
23 | 24 | ||
24 | int main( int argc, char** argv ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) |
25 | { | ||
26 | QPEApplication a( argc, argv ); | ||
27 | CityTime main; | ||
28 | a.showMainWidget( &main ); | ||
29 | return a.exec(); | ||
30 | } | ||