author | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
commit | 0c74629e8f5c12a9b5a282b817f884fa10dee491 (patch) (unidiff) | |
tree | 3294663b92023f8d24d68a01022e011a3c94002d /noncore/games/wordgame | |
parent | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (diff) | |
download | opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.zip opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.gz opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.bz2 |
Merge from the 1.0.x release
-rw-r--r-- | noncore/games/wordgame/main.cpp | 10 | ||||
-rw-r--r-- | noncore/games/wordgame/wordgame.h | 1 | ||||
-rw-r--r-- | noncore/games/wordgame/wordgame.pro | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/noncore/games/wordgame/main.cpp b/noncore/games/wordgame/main.cpp index cd4600e..f32acff 100644 --- a/noncore/games/wordgame/main.cpp +++ b/noncore/games/wordgame/main.cpp | |||
@@ -21,14 +21,8 @@ | |||
21 | #include "wordgame.h" | 21 | #include "wordgame.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char ** argv ) | ||
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | 26 | ||
29 | WordGame mw; | 27 | OPIE_EXPORT_APP( OApplicationFactory<WordGame> ) |
30 | //QPEApplication::setInputMethodHint( &mw, QPEApplication::AlwaysOff ); | ||
31 | a.showMainWidget(&mw); | ||
32 | 28 | ||
33 | return a.exec(); | ||
34 | } | ||
diff --git a/noncore/games/wordgame/wordgame.h b/noncore/games/wordgame/wordgame.h index f73c85a..020a4b5 100644 --- a/noncore/games/wordgame/wordgame.h +++ b/noncore/games/wordgame/wordgame.h | |||
@@ -309,6 +309,7 @@ class WordGame : public QMainWindow { | |||
309 | public: | 309 | public: |
310 | WordGame( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 310 | WordGame( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
311 | ~WordGame(); | 311 | ~WordGame(); |
312 | static QString appName() { return QString::fromLatin1("wordgame"); } | ||
312 | 313 | ||
313 | private slots: | 314 | private slots: |
314 | void endTurn(); | 315 | void endTurn(); |
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro index e997adc..7ef2bfd 100644 --- a/noncore/games/wordgame/wordgame.pro +++ b/noncore/games/wordgame/wordgame.pro | |||
@@ -1,6 +1,4 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = wordgame.h | 2 | HEADERS = wordgame.h |
5 | SOURCES = main.cpp \ | 3 | SOURCES = main.cpp \ |
6 | wordgame.cpp | 4 | wordgame.cpp |
@@ -10,4 +8,5 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
10 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
11 | LIBS += -lqpe | 9 | LIBS += -lqpe |
12 | 10 | ||
11 | |||
13 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |