summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 23:35:09 (UTC)
committer drw <drw>2004-02-23 23:35:09 (UTC)
commitda044756096aef5819add4c0faf5f305b155648f (patch) (unidiff)
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 @@
1 config HELPBROWSER 1 config HELPBROWSER
2 boolean "opie-helpbrowser (display html help files)" 2 boolean "opie-helpbrowser (display html help files)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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 @@
1 TEMPLATE= app 1CONFIG += qt warn_on release quick-app
2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = helpbrowser.h magictextbrowser.h 2 HEADERS = helpbrowser.h magictextbrowser.h
5 SOURCES = helpbrowser.cpp magictextbrowser.cpp \ 3 SOURCES = helpbrowser.cpp magictextbrowser.cpp \
6 main.cpp 4 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 6 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 7LIBS += -lqpe -lopiecore2
10 INTERFACES= 8 INTERFACES=
11TARGET = helpbrowser 9TARGET = helpbrowser
12 10
13include ( $(OPIEDIR)/include.pro ) 11include ( $(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 @@
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "helpbrowser.h" 21#include "helpbrowser.h"
22 22
23#include <qtopia/qpeapplication.h> 23#include <opie2/oapplicationfactory.h>
24#include <opie/oapplicationfactory.h>
25 24
26OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> ) 25OPIE_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 @@
1Package: opie-helpbrowser 1Package: opie-helpbrowser
2Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser 2Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
3Priority: optional 3Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Arch: iPAQ 7Arch: iPAQ
8Depends: task-opie-minimal 8Depends: task-opie-minimal, libopiecore2
9Description: Browse HTML help documents 9Description: Browse HTML help documents
10 The HTML help browser for the Opie environment. 10 The HTML help browser for the Opie environment.
11Version: $QPE_VERSION$EXTRAVERSION 11Version: $QPE_VERSION$EXTRAVERSION