Changeset 8 for trunk/src/kernel/qapplication.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qapplication.cpp (modified) (7 diffs)

trunk/src/kernel/qapplication.cpp

@@ -739 +739 @@
   If \a GUIenabled is FALSE, the application does not connect to the
   X-server.
-  On Windows and Macintosh, currently the window system is always
+  On Windows, OS/2 and Macintosh, currently the window system is always
   initialized, regardless of the value of GUIenabled. This may change in
   future versions of Qt.
@@ -1232 +1232 @@
             else
                 style = "Windows";              // default styles for Windows
+#elif defined(Q_WS_PM)
+            /// @todo (dmik) temporary, until the native style is done
+            style = "Windows";          // default style for OS/2
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             style = "CDE";                      // default style for X11 on Solaris
@@ -1541 +1544 @@
 }
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
 extern const char *qAppFileName();
 #endif
 
 #ifndef QT_NO_DIR
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !(defined Q_WS_PM)
 static QString resolveSymlinks( const QString& path, int depth = 0 )
 {
@@ -1590 +1593 @@
     }
 }
-#endif // Q_WS_WIN
+#endif // !Q_WS_WIN && !Q_WS_PM
 
 /*!
@@ -1627 +1630 @@
 QString QApplication::applicationFilePath()
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     return QDir::cleanDirPath( QFile::decodeName( qAppFileName() ) );
 #else
@@ -1706 +1709 @@
         QString installPathPlugins = QString::fromLocal8Bit(qInstallPathPlugins());
         if ( QFile::exists(installPathPlugins) ) {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
             installPathPlugins.replace('\\', '/');
 #endif
@@ -1715 +1718 @@
         if (qApp)
             app_location = qApp->applicationFilePath();
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
         else {
             app_location = QString(qAppFileName());