| -rw-r--r-- | noncore/apps/opie-write/config.in | 2 | ||||
| -rw-r--r-- | noncore/apps/opie-write/main.cpp | 4 | ||||
| -rw-r--r-- | noncore/apps/opie-write/opie-write.control | 6 | ||||
| -rw-r--r-- | noncore/apps/opie-write/opie-write.pro | 36 |
4 files changed, 24 insertions, 24 deletions
diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in index 624b1e5..3b2e3f3 100644 --- a/noncore/apps/opie-write/config.in +++ b/noncore/apps/opie-write/config.in @@ -1,4 +1,4 @@ config OPIE-WRITE boolean "opie-write (rich text editor)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/apps/opie-write/main.cpp b/noncore/apps/opie-write/main.cpp index 2cdfa55..6a8aaaa 100644 --- a/noncore/apps/opie-write/main.cpp +++ b/noncore/apps/opie-write/main.cpp @@ -10,19 +10,19 @@ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR ** PURPOSE. ** ** email sales@trolltech.com for information about Qtopia License ** Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> #include "mainwindow.h" +#include <opie2/oapplicationfactory.h> + OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control index 880c2a8..6e7a9a9 100644 --- a/noncore/apps/opie-write/opie-write.control +++ b/noncore/apps/opie-write/opie-write.control @@ -1,10 +1,10 @@ Package: opie-write Files: plugins/application/libopie-write.so* bin/opie-write apps/Applications/opie-write.desktop pics/opie-write Priority: optional Section: opie/applications -Maintainer: L.J. Potter <ljp@llornkcor.com> +Maintainer: L.J. Potter <ljp@llornkcor.com> Architecture: arm -Depends: task-opie-minimal -Description: Rich Text Editor +Depends: task-opie-minimal, libopiecore2 +Description: Rich Text Editor The rich text editor for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro index bbaacd3..d39bc9d 100644 --- a/noncore/apps/opie-write/opie-write.pro +++ b/noncore/apps/opie-write/opie-write.pro @@ -1,27 +1,27 @@ -CONFIG += qt warn on release quick-app +CONFIG += qt warn on release quick-app -HEADERS = qcleanuphandler.h \ - qcomplextext_p.h \ - qrichtext_p.h \ - qstylesheet.h \ - qtextedit.h \ - mainwindow.h +HEADERS = qcleanuphandler.h \ + qcomplextext_p.h \ + qrichtext_p.h \ + qstylesheet.h \ + qtextedit.h \ + mainwindow.h -SOURCES = qcomplextext.cpp \ - qstylesheet.cpp \ - qrichtext_p.cpp \ - qrichtext.cpp \ - qtextedit.cpp \ - main.cpp \ - mainwindow.cpp +SOURCES = qcomplextext.cpp \ + qstylesheet.cpp \ + qrichtext_p.cpp \ + qrichtext.cpp \ + qtextedit.cpp \ + main.cpp \ + mainwindow.cpp -INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopiecore2 -TARGET = opie-write +TARGET = opie-write include ( $(OPIEDIR)/include.pro ) |