Changeset 631 for trunk/tools/assistant/compat

Timestamp:

Mar 4, 2010, 9:03:38 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

tools/assistant: Make it build on OS/2.

Location:

trunk/tools/assistant/compat

Files:

• assistant.pro (modified) (1 diff)
• assistant_os2.ico (added)
• assistant_os2.rc (added)
• compat.pro (modified) (1 diff)
• lib/lib.pro (modified) (1 diff)
• mainwindow.cpp (modified) (1 diff)

trunk/tools/assistant/compat/assistant.pro

@@ -57 +57 @@
 }
 
+os2 {
+    RC_FILE = assistant_os2.rc
+}
+
 mac {
     ICON = assistant.icns

trunk/tools/assistant/compat/compat.pro

@@ -57 +57 @@
 }
 
+os2 {
+    RC_FILE = assistant_os2.rc
+}
+
 mac {
     ICON = assistant.icns

trunk/tools/assistant/compat/lib/lib.pro

@@ -2 +2 @@
 QT += network
 TARGET                = QtAssistantClient
+os2:TARGET_SHORT      = QtAsCl
+
 isEmpty(QT_MAJOR_VERSION) {
    VERSION=4.3.0

trunk/tools/assistant/compat/mainwindow.cpp

@@ -377 +377 @@
     QUrl url(name);
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     if (!url.isValid() || url.scheme().isEmpty() || url.scheme().toLower() != QLatin1String("file:")) {
         int i = name.indexOf(QLatin1Char('#'));