Changeset 631 for trunk/tools

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk/tools/assistant

Files:

• compat/assistant.pro (modified) (1 diff)
• compat/assistant_os2.ico (added)
• compat/assistant_os2.rc (added)
• compat/compat.pro (modified) (1 diff)
• compat/lib/lib.pro (modified) (1 diff)
• compat/mainwindow.cpp (modified) (1 diff)
• lib/fulltextsearch/fulltextsearch.pro (modified) (1 diff)
• lib/fulltextsearch/qclucene-config_p.h (modified) (1 diff)
• tools/assistant/assistant.pro (modified) (1 diff)
• tools/assistant/assistant_os2.ico (added)
• tools/assistant/assistant_os2.rc (added)

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('#'));

trunk/tools/assistant/lib/fulltextsearch/fulltextsearch.pro

@@ -13 +13 @@
 TEMPLATE = lib
 TARGET = QtCLucene
+os2:TARGET_SHORT = QtCLuc
+
 DEFINES += QHELP_LIB
 include(../../../../src/qbase.pri)

trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h

@@ -205 +205 @@
 #endif
 
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && !defined(__OS2__)
     /* Define if you have POSIX threads libraries and header files. */
 #   ifndef _CL_HAVE_PTHREAD

trunk/tools/assistant/tools/assistant/assistant.pro

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