summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 17:22:06 (UTC)
committer drw <drw>2004-02-23 17:22:06 (UTC)
commitd1e639b1272a6ba18ebe3fc982148ce0cb5c8c84 (patch) (unidiff)
tree9632402c2d85c15d6486117c0a74b290e48b17e0
parent8251b9ad05907eaf63035e549f51a4bdb15ea2e3 (diff)
downloadopie-d1e639b1272a6ba18ebe3fc982148ce0cb5c8c84.zip
opie-d1e639b1272a6ba18ebe3fc982148ce0cb5c8c84.tar.gz
opie-d1e639b1272a6ba18ebe3fc982148ce0cb5c8c84.tar.bz2
Conf Edit: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/confedit/confedit.pro20
-rw-r--r--noncore/apps/confedit/config.in2
-rw-r--r--noncore/apps/confedit/main.cpp2
-rw-r--r--noncore/apps/confedit/opie-confeditor.control2
4 files changed, 13 insertions, 13 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 64d5de0..c0f79be 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,21 +1,21 @@
1 CONFIG = qt warn_on release quick-app 1CONFIG = qt warn_on release quick-app
2 HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h 2HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
3 SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp 3SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
4INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
5 DEPENDPATH+= $(OPIEDIR)/ioclude 5DEPENDPATH += $(OPIEDIR)/ioclude
6 INTERFACES= 6INTERFACES =
7LIBS += -lopiecore2 -lopieui2 7LIBS += -lopiecore2
8 TARGET = confedit 8TARGET = confedit
9 9
10!contains( platform, x11 ) { 10!contains( platform, x11 ) {
11 11
12 include ( $(OPIEDIR)/include.pro ) 12 include ( $(OPIEDIR)/include.pro )
13 LIBS += -lqpe 13 LIBS += -lqpe
14} 14}
15 15
16contains( platform, x11 ) { 16contains( platform, x11 ) {
17 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 17 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
18} 18}
19 19
20 20
21 21
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in
index e9bc1d1..e377307 100644
--- a/noncore/apps/confedit/config.in
+++ b/noncore/apps/confedit/config.in
@@ -1,4 +1,4 @@
1 config CONFEDIT 1 config CONFEDIT
2 boolean "opie-confeditor (generic editor for all Opie settings)" 2 boolean "opie-confeditor (generic editor for all Opie settings)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE && LIBOPIE2UI 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 7a312c3..584e6b2 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,5 +1,5 @@
1 1
2#include "mainwindow.h" 2#include "mainwindow.h"
3#include <opie/oapplicationfactory.h> 3#include <opie2/oapplicationfactory.h>
4 4
5OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 5OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/confedit/opie-confeditor.control b/noncore/apps/confedit/opie-confeditor.control
index 12ae6a9..b8e4c7d 100644
--- a/noncore/apps/confedit/opie-confeditor.control
+++ b/noncore/apps/confedit/opie-confeditor.control
@@ -1,9 +1,9 @@
1Package: opie-confeditor 1Package: opie-confeditor
2Files: bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png 2Files: bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Maintainer: Patrick S. Vogt <tille@handhelds.org> 5Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION-$SUB_VERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal, libopiecore2
9Description: An enditor for the ~/Settings/*.conf files 9Description: An enditor for the ~/Settings/*.conf files