| -rw-r--r-- | libopie2/opiecore/oapplication.cpp | 11 | ||||
| -rw-r--r-- | libopie2/opiecore/oapplication.h | 11 | ||||
| -rw-r--r-- | libopie2/opiecore/opiecore.pro | 9 |
3 files changed, 8 insertions, 23 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index 84cab48..c3cacce 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -53,13 +53,9 @@ class OApplicationPrivate /**************************************************************************************************/ OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) -#ifdef QWS :QPEApplication( argc, argv ), -#else - :QApplication( argc, argv ), -#endif _appname( rAppName ), _config( 0 ) { init(); @@ -111,16 +107,9 @@ void OApplication::init() void OApplication::showMainWidget( QWidget* widget, bool nomax ) { -#ifdef QWS QPEApplication::showMainWidget( widget, nomax ); -#else -// tille: I am quit sure if this is the right way to do.. - odDebug(nomax,7) << "ignoring nomax"; - setMainWidget( widget ); - widget->show(); -#endif widget->setCaption( _appname ); } diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 3043910..72a659e 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -32,22 +32,17 @@ #define OAPPLICATION_H #define oApp OApplication::oApplication() -#ifdef QWS + #include <qpe/qpeapplication.h> -#else -#include <qapplication.h> -#endif + class OApplicationPrivate; class OConfig; -#ifdef QWS + class OApplication : public QPEApplication -#else -class OApplication : public QApplication -#endif { Q_OBJECT public: diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index c8a291a..18c6986 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro @@ -1,18 +1,16 @@ TEMPLATE = lib CONFIG += qt warn_on debug DESTDIR = $(OPIEDIR)/lib -HEADERS = oapplication.h \ - oconfig.h \ +HEADERS = oconfig.h \ ocompletionbase.h \ ocompletion.h \ odebug.h \ oglobal.h \ oglobalsettings.h \ osortablevaluelist.h -SOURCES = oapplication.cpp \ - oconfig.cpp \ +SOURCES = oconfig.cpp \ ocompletionbase.cpp \ ocompletion.cpp \ odebug.cpp \ oglobal.cpp \ @@ -27,12 +25,15 @@ MOC_DIR = moc OBJECTS_DIR = obj !contains( platform, x11 ) { + HEADERS += oapplication.h + SOURCES += oapplication.cpp LIBS = -lqpe include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { + message( NOT building oapplication for X11 ) LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } |