libopie2 compiles for qt3/x11 now

run:
	qmake "platform=x11" libopie2.pro

3 files changed, 30 insertions, 3 deletions

diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index 06d8ba2..84cab48 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -32,2 +32,3 @@
 #include <opie2/oconfig.h>
+#include <opie2/odebug.h>
 
@@ -55,3 +56,7 @@ class OApplicationPrivate
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
+#ifdef QWS
              :QPEApplication( argc, argv ),
+#else
+             :QApplication( argc, argv ),
+#endif
              _appname( rAppName ),
@@ -109,3 +114,10 @@ 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 6bc2b1c..3043910 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -35,3 +35,7 @@
 
+#ifdef QWS
 #include <qpe/qpeapplication.h>
+#else
+#include <qapplication.h>
+#endif
 
@@ -40,3 +44,7 @@ class OConfig;
 
-class OApplication: public QPEApplication
+#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 ed7d6d7..c8a291a 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -25,3 +25,2 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        = -lqpe
 MOC_DIR     = moc
@@ -29,3 +28,11 @@ OBJECTS_DIR = obj
 
-include ( $(OPIEDIR)/include.pro )
+
+!contains( platform, x11 ) {
+  LIBS        = -lqpe
+  include ( $(OPIEDIR)/include.pro )
+}
+
+contains( platform, x11 ) {
+  LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+}