| author | zecke <zecke> | 2003-10-07 12:51:21 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2003-10-07 12:51:21 (UTC) |
| commit | c21de570e101058c5f1c4c5973a96df5a9bf62b2 (patch) (side-by-side diff) | |
| tree | 5b5b2b440990eac3757549745f7e467d23bde08f | |
| parent | 37ddd7628c5406f05806b97471db72e2ee943d86 (diff) | |
| download | opie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.zip opie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.tar.gz opie-c21de570e101058c5f1c4c5973a96df5a9bf62b2.tar.bz2 | |
-Kill stupid define which sets QWS_SIZE to 240x320
-Include built-in shutdown only if OPIE_NO_BUILTIN_SHUTDOWN is defined
| -rw-r--r-- | core/launcher/main.cpp | 2 | ||||
| -rw-r--r-- | core/launcher/server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index ad40536..74965df 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -161,5 +161,5 @@ void initEnvironment() config.write(); -#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) +#if 0 setenv( "QWS_SIZE", "240x320", 0 ); #endif diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp index 450d8e5..4c62b78 100644 --- a/core/launcher/server.cpp +++ b/core/launcher/server.cpp @@ -111,5 +111,5 @@ static Global::Command builtins[] = { { "calibrate", calibrate, 1, 0 }, // No tr #endif -#if !defined(QT_QWS_CASSIOPEIA) +#if !defined(OPIE_NO_BUILTIN_SHUTDOWN) { "shutdown", Global::shutdown, 1, 0 }, // No tr // { "run", run, 1, 0 }, // No tr |