4 files changed, 7 insertions, 6 deletions

diff --git a/core/tools/quicklauncher/config.in b/core/tools/quicklauncher/config.in
index c105e94..eacbcf6 100644
--- a/core/tools/quicklauncher/config.in
+++ b/core/tools/quicklauncher/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index 3e2b5fd..7acace9 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -7,3 +7,3 @@
 
-#include <opie/owait.h>
+#include <opie2/owait.h>
 
@@ -12,3 +12,3 @@
 
-namespace Opie {
+namespace QuickPrivate {
 
@@ -68,3 +68 @@ namespace Opie {
 
-/* small hack ;) */
-using namespace Opie;
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 1d6774c..f3055cc 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -41,2 +41,4 @@
 
+using QuickPrivate::PluginLoader;
+
 static QPEApplication *app = 0;
@@ -54,2 +56,3 @@ extern char **environ;
 #include <stdarg.h>
+using namespace Opie::Ui;
 void setproctitle (const char *fmt,...) {
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 6ab5fc8..ae390e5 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -9,3 +9,3 @@ INTERFACES	=
         INCLUDEPATH+= $(OPIEDIR)/include
-        LIBS       += -lqpe -lopie
+        LIBS       += -lqpe -lopiecore2 -lopieui2