summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp11
-rw-r--r--libopie2/opiecore/oapplication.h11
-rw-r--r--libopie2/opiecore/opiecore.pro9
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
@@ -56,7 +56,3 @@ class OApplicationPrivate
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-#ifdef QWS
:QPEApplication( argc, argv ),
-#else
- :QApplication( argc, argv ),
-#endif
_appname( rAppName ),
@@ -114,10 +110,3 @@ 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
@@ -35,7 +35,5 @@
-#ifdef QWS
+
#include <qpe/qpeapplication.h>
-#else
-#include <qapplication.h>
-#endif
+
@@ -44,7 +42,4 @@ class OConfig;
-#ifdef QWS
+
class OApplication : public QPEApplication
-#else
-class OApplication : public QApplication
-#endif
{
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
@@ -3,4 +3,3 @@ CONFIG += qt warn_on debug
DESTDIR = $(OPIEDIR)/lib
-HEADERS = oapplication.h \
- oconfig.h \
+HEADERS = oconfig.h \
ocompletionbase.h \
@@ -12,4 +11,3 @@ HEADERS = oapplication.h \
-SOURCES = oapplication.cpp \
- oconfig.cpp \
+SOURCES = oconfig.cpp \
ocompletionbase.cpp \
@@ -30,2 +28,4 @@ OBJECTS_DIR = obj
!contains( platform, x11 ) {
+ HEADERS += oapplication.h
+ SOURCES += oapplication.cpp
LIBS = -lqpe
@@ -35,2 +35,3 @@ OBJECTS_DIR = obj
contains( platform, x11 ) {
+ message( NOT building oapplication for X11 )
LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib