-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 8 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 9 |
3 files changed, 28 insertions, 1 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 @@ -27,12 +27,13 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <opie2/oapplication.h> #include <opie2/oconfig.h> +#include <opie2/odebug.h> #include <signal.h> #include <stdio.h> OApplication* OApplication::_instance = 0; @@ -50,13 +51,17 @@ class OApplicationPrivate /**************************************************************************************************/ /* OApplication /**************************************************************************************************/ OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) +#ifdef QWS :QPEApplication( argc, argv ), +#else + :QApplication( argc, argv ), +#endif _appname( rAppName ), _config( 0 ) { init(); } @@ -104,13 +109,20 @@ 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 ); } void OApplication::setTitle( const QString& title ) const { 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 @@ -30,18 +30,26 @@ #ifndef OAPPLICATION_H #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: /** * Constructor. Parses command-line arguments and sets the window caption. 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 @@ -20,12 +20,19 @@ SOURCES = oapplication.cpp \ INTERFACES = TARGET = opiecore2 VERSION = 1.8.1 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS = -lqpe MOC_DIR = moc OBJECTS_DIR = obj + +!contains( platform, x11 ) { + LIBS = -lqpe include ( $(OPIEDIR)/include.pro ) +} + +contains( platform, x11 ) { + LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib +} |