| -rw-r--r-- | noncore/apps/oxygen/config.in | 2 | ||||
| -rw-r--r-- | noncore/apps/oxygen/main.cpp | 3 | ||||
| -rw-r--r-- | noncore/apps/oxygen/opie-oxygen.control | 2 | ||||
| -rw-r--r-- | noncore/apps/oxygen/oxygen.pro | 14 |
4 files changed, 10 insertions, 11 deletions
diff --git a/noncore/apps/oxygen/config.in b/noncore/apps/oxygen/config.in index 809f3e6..b3e30ff 100644 --- a/noncore/apps/oxygen/config.in +++ b/noncore/apps/oxygen/config.in @@ -1,4 +1,4 @@ config OXYGEN boolean "opie-oxygen (Periodic System of the Elements)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp index ac992aa..276b90d 100644 --- a/noncore/apps/oxygen/main.cpp +++ b/noncore/apps/oxygen/main.cpp @@ -14,11 +14,10 @@ * ( at your option ) any later version. * * * **************************************************************************/ +#include <opie2/oapplicationfactory.h> -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> #include "oxygen.h" OPIE_EXPORT_APP( OApplicationFactory<Oxygen> ) diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control index fc834f3..16051db 100644 --- a/noncore/apps/oxygen/opie-oxygen.control +++ b/noncore/apps/oxygen/opie-oxygen.control @@ -3,8 +3,8 @@ Files: plugins/application/liboxygen.so* bin/oxygen apps/Applications/oxygen.des Priority: optional Section: opie/applications Maintainer: Carsten Niehaus <cniehaus@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Periodic System of the Elements The chemistry application for the Opie-environment Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro index 71d4dac..0d61d58 100644 --- a/noncore/apps/oxygen/oxygen.pro +++ b/noncore/apps/oxygen/oxygen.pro @@ -1,16 +1,16 @@ -CONFIG = qt warn_on release quick-app -HEADERS = oxygen.h \ +CONFIG = qt warn_on release quick-app +HEADERS = oxygen.h \ kmolcalc.h \ kmolelements.h \ calcdlgui.h \ dataTable.h \ psewidget.h \ oxyframe.h \ datawidgetui.h -SOURCES = main.cpp \ - oxygen.cpp \ +SOURCES = main.cpp \ + oxygen.cpp \ kmolcalc.cpp \ calcdlgui.cpp \ kmolelements.cpp \ dataTable.cpp \ @@ -18,10 +18,10 @@ SOURCES = main.cpp \ oxyframe.cpp \ datawidgetui.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -INTERFACES = calcdlg.ui +LIBS += -lqpe -lopiecore2 +INTERFACES = calcdlg.ui -TARGET = oxygen +TARGET = oxygen include ( $(OPIEDIR)/include.pro ) |