summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 23:35:09 (UTC)
committer drw <drw>2004-02-23 23:35:09 (UTC)
commitda044756096aef5819add4c0faf5f305b155648f (patch) (side-by-side diff)
tree41b98838fa946abd504f76897f7e2bec45fc5ddf
parent8fe156f20106aaa4861a60314273733685d37dad (diff)
downloadopie-da044756096aef5819add4c0faf5f305b155648f.zip
opie-da044756096aef5819add4c0faf5f305b155648f.tar.gz
opie-da044756096aef5819add4c0faf5f305b155648f.tar.bz2
Help Browser: libopie->libopie2, make a quicklaunch app
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/helpbrowser/config.in2
-rw-r--r--core/apps/helpbrowser/helpbrowser.pro6
-rw-r--r--core/apps/helpbrowser/main.cpp3
-rw-r--r--core/apps/helpbrowser/opie-helpbrowser.control4
4 files changed, 6 insertions, 9 deletions
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,13 +1,11 @@
-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
include ( $(OPIEDIR)/include.pro )
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
@@ -11,16 +11,15 @@
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "helpbrowser.h"
-#include <qtopia/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> )
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 <opie@handhelds.org>
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