From da044756096aef5819add4c0faf5f305b155648f Mon Sep 17 00:00:00 2001 From: drw Date: Mon, 23 Feb 2004 23:35:09 +0000 Subject: Help Browser: libopie->libopie2, make a quicklaunch app --- diff --git a/core/apps/helpbrowser/config.in b/core/apps/helpbrowser/config.in index d72df4b..ecc7bff 100644 --- a/core/apps/helpbrowser/config.in +++ b/core/apps/helpbrowser/config.in @@ -1,4 +1,4 @@ config HELPBROWSER boolean "opie-helpbrowser (display html help files)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 9df99ba..22e0b50 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro @@ -1,12 +1,10 @@ -TEMPLATE = app -CONFIG = qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = helpbrowser.h magictextbrowser.h SOURCES = helpbrowser.cpp magictextbrowser.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 INTERFACES = TARGET = helpbrowser diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp index dc82e93..c726cd3 100644 --- a/core/apps/helpbrowser/main.cpp +++ b/core/apps/helpbrowser/main.cpp @@ -20,7 +20,6 @@ #include "helpbrowser.h" -#include -#include +#include OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control index e604e18..90deddd 100644 --- a/core/apps/helpbrowser/opie-helpbrowser.control +++ b/core/apps/helpbrowser/opie-helpbrowser.control @@ -1,11 +1,11 @@ Package: opie-helpbrowser -Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser +Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser Priority: optional Section: opie/applications Maintainer: Opie Team Architecture: arm Arch: iPAQ -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Browse HTML help documents The HTML help browser for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION -- cgit v0.9.0.2