1 files changed, 23 insertions, 0 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 1117240..4adfc8f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -719,139 +719,162 @@ void QPEApplication::processQCopFile()
         d->enqueueQCop(channel,message,data);
     }
     ::ftruncate(f.handle(), 0);
 #ifndef Q_OS_WIN32
     f.flush();
     flock(f.handle(), LOCK_UN);
 #endif
     }
 #endif
 }
 
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
 #ifndef QT_NO_TRANSLATION
 static void qtopia_loadTranslations( const QStringList& qms )
 {
     QStringList langs = Global::languageList();
 
     for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
         QString lang = *it;
 
         QTranslator * trans;
         QString tfn;
 
         for (QStringList::ConstIterator qmit = qms.begin(); qmit!=qms.end(); ++qmit) {
             trans = new QTranslator(qApp);
             tfn = QPEApplication::qpeDir() + "i18n/" + lang + "/" + *qmit + ".qm";
             if ( trans->load( tfn ))
                 qApp->installTranslator( trans );
             else
                 delete trans;
         }
     }
 }
 #endif
 
+/*
+	Turn off qDebug in release mode
+ */
+static void qtopiaMsgHandler(QtMsgType type, const char* msg)
+{
+		switch ( type ) {
+			case QtDebugMsg:
+#ifdef QT_DEBUG
+					fprintf( stderr, "Debug: %s\n", msg );
+#endif
+					break;
+			case QtWarningMsg:
+#ifdef QT_DEBUG
+					fprintf( stderr, "Warning: %s\n", msg );
+#endif
+					break;
+			case QtFatalMsg:
+					fprintf( stderr, "Fatal: %s\n", msg );
+					abort();
+    }
+}
+
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
     QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
+    qInstallMsgHandler(qtopiaMsgHandler);
 
     d = new QPEApplicationData;
     d->loadTextCodecs();
     d->loadImageCodecs();
 
     setFont( QFont( d->fontFamily, d->fontSize ) );
     AppLnk::setSmallIconSize( d->smallIconSize );
     AppLnk::setBigIconSize( d->bigIconSize );
 
     QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
     connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 
 
     sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
 /* COde now in initapp */
 #if 0
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
     QString qcopfn( "/tmp/qcop-msg-" );
     qcopfn += QString( argv[ 0 ] ); // append command name
 
     QFile f( qcopfn );
     if ( f.open( IO_ReadOnly ) ) {
         flock( f.handle(), LOCK_EX );
     }
 
 
 
     QCString channel = QCString( argv[ 0 ] );
     channel.replace( QRegExp( ".*/" ), "" );
     d->appName = channel;
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this );
     connect( pidChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT( pidMessage(const QCString&,const QByteArray&) ) );
 
     if ( f.isOpen() ) {
         d->keep_running = FALSE;
         QDataStream ds( &f );
         QCString channel, message;
         QByteArray data;
         while ( !ds.atEnd() ) {
             ds >> channel >> message >> data;
             d->enqueueQCop( channel, message, data );
         }
 
         flock( f.handle(), LOCK_UN );
         f.close();
         f.remove();
     }
 
     for ( int a = 0; a < argc; a++ ) {
         if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
             argv[ a ] = argv[ a + 1 ];
             a++;
             d->preloaded = TRUE;
             argc -= 1;
         }
         else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
             argv[ a ] = argv[ a + 1 ];