summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 17:22:06 (UTC)
committer drw <drw>2004-02-23 17:22:06 (UTC)
commitd1e639b1272a6ba18ebe3fc982148ce0cb5c8c84 (patch) (side-by-side diff)
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 @@
-CONFIG = qt warn_on release quick-app
-HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
-SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
+CONFIG = qt warn_on release quick-app
+HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
+SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += $(OPIEDIR)/ioclude
-INTERFACES =
-LIBS += -lopiecore2 -lopieui2
-TARGET = confedit
+DEPENDPATH += $(OPIEDIR)/ioclude
+INTERFACES =
+LIBS += -lopiecore2
+TARGET = confedit
!contains( platform, x11 ) {
-
+
include ( $(OPIEDIR)/include.pro )
- LIBS += -lqpe
+ LIBS += -lqpe
}
contains( platform, x11 ) {
- LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+ LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
}
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 @@
config CONFEDIT
boolean "opie-confeditor (generic editor for all Opie settings)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE && LIBOPIE2UI
+ 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 @@
#include "mainwindow.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_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 @@
Package: opie-confeditor
Files: bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png
Priority: optional
Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: An enditor for the ~/Settings/*.conf files