| -rw-r--r-- | noncore/tools/formatter/config.in | 2 | ||||
| -rw-r--r-- | noncore/tools/formatter/formatter.pro | 2 | ||||
| -rw-r--r-- | noncore/tools/formatter/main.cpp | 3 | ||||
| -rw-r--r-- | noncore/tools/formatter/opie-formatter.control | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in index 0748213..5758180 100644 --- a/noncore/tools/formatter/config.in +++ b/noncore/tools/formatter/config.in @@ -1,4 +1,4 @@ config FORMATTER boolean "opie-formatter (filesystem formatting and mount app)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro index 6450954..daedad9 100644 --- a/noncore/tools/formatter/formatter.pro +++ b/noncore/tools/formatter/formatter.pro @@ -3,7 +3,7 @@ HEADERS = formatter.h inputDialog.h output.h SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp TARGET = formatter INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp index 6228e55..bdd4a2c 100644 --- a/noncore/tools/formatter/main.cpp +++ b/noncore/tools/formatter/main.cpp @@ -9,11 +9,10 @@ * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include <qpe/qpeapplication.h> #include "formatter.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> ) diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control index 11fe57a..19ba7c8 100644 --- a/noncore/tools/formatter/opie-formatter.control +++ b/noncore/tools/formatter/opie-formatter.control @@ -3,7 +3,7 @@ Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices Priority: optional Section: opie/settings Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: The filesystem formatting and mountpoint app for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION |