merge core/tools/*

3 files changed, 34 insertions, 2 deletions

diff --git a/core/tools/quicklauncher/config.in b/core/tools/quicklauncher/config.in
new file mode 100644
index 0000000..c105e94
--- a/dev/null
+++ b/core/tools/quicklauncher/config.in
@@ -0,0 +1,4 @@
+  config QUICKLAUNCHER
+    boolean "The Quick Launcher Loader"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 7d368ab..cc411fd 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -25,5 +25,11 @@
 #include <qcopchannel_qws.h>
 #define QTOPIA_INTERNAL_INITAPP
+
+#ifdef private
+#       undef  private
+#endif
+#define private public
 #include <qtopia/qpeapplication.h>
+#undef private
 #include <stdio.h>
 #include <stdlib.h>
@@ -236,9 +242,21 @@ int main( int argc, char** argv )
     if ( mainWindow )
         delete (QWidget*)mainWindow;
+        
+    delete app;
     if ( appIface )
         loader->releaseInterface( appIface );
     delete loader;
-
-    delete app;
+    // Neither QLibrary nor my Dropin is a QObject and they don't depend
+    // on a qApp so we destroy QWidget::destroyMapper() without
+    // crashing the app
+    //
+    // The problem is there are some 'static' resources not freed
+    // in the apps and on destructing these objects are not available
+    // anymore. In future fix up the apps but for now
+    // we just skip deletion and hope things go well -zecke
+//    delete app;
+    // hack instead -zecke
+//    delete app->pidChannel;
+//    app->pidChannel = 0;
 
     return rv;
diff --git a/core/tools/quicklauncher/opie-quicklauncher.control b/core/tools/quicklauncher/opie-quicklauncher.control
new file mode 100644
index 0000000..79b9493
--- a/dev/null
+++ b/core/tools/quicklauncher/opie-quicklauncher.control
@@ -0,0 +1,10 @@
+Package: opie-quicklauncher
+Files: bin/quicklauncher
+Priority: required
+Section: opie/system
+Maintainer: Trolltech (www.trolltech.com)
+Architecture: arm
+Version: $QPE_VERSION$EXTRAVERSION
+Depends:
+Description: Quick launcher stub
+ Launcher stub for quick launch enabled applications.