Changeset 596 for trunk/tools

Timestamp:

Feb 23, 2010, 3:37:44 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

lrelease: Fixed the build.

Location:

trunk/tools/linguist

Files:

• lrelease/lrelease.pro (modified) (2 diffs)
• shared/profileevaluator.cpp (modified) (3 diffs)

trunk/tools/linguist/lrelease/lrelease.pro

@@ -11 +11 @@
     $$QT_SOURCE_TREE/src/corelib/io/qsettings.cpp
 win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
+os2:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_os2.cpp
 macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
 
@@ -18 +19 @@
 
 win32:LIBS += -ladvapi32   # for qsettings_win.cpp
+os2:LIBS += -lregistry.dll   # for qsettings_os2.cpp
 
 target.path=$$[QT_INSTALL_BINS]

trunk/tools/linguist/shared/profileevaluator.cpp

@@ -58 +58 @@
 #include <QtCore/QTextStream>
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX)
 #include <unistd.h>
 #include <sys/utsname.h>
-#else
+#elif defined(Q_OS_WIN32)
 #include <Windows.h>
+#elif defined(Q_OS_OS2)
 #endif
 #include <stdio.h>
@@ -112 +113 @@
     Q_ASSERT(!((flags & Option::FixPathToLocalSeparators) && (flags & Option::FixPathToTargetSeparators)));
     if (flags & Option::FixPathToLocalSeparators) {
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
         string = string.replace(QLatin1Char('/'), QLatin1Char('\\'));
 #else
@@ -2334 +2335 @@
             }
         }
+#elif defined(Q_OS_OS2)
+        if (type == QLatin1String("os"))
+            ret = QString::fromLatin1("OS/2");
+        else if (type == QLatin1String("name"))
+            ret = QString::fromLocal8Bit(qgetenv("HOSTNAME"));
+        // @todo use QSysInfo::OS2Version for version/version_string once it's there
+        else if (type == QLatin1String("version"))
+            ret = QString::fromLatin1("unknown");
+        else if (type == QLatin1String("version_string"))
+            ret = QString::fromLatin1("unknown");
+        else if (type == QLatin1String("arch"))
+            ret = QString::fromLatin1("x86");
 #elif defined(Q_OS_UNIX)
         struct utsname name;