Long live Qt 4.5!

5 files changed, 697 insertions, 0 deletions

diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
new file mode 100644
index 0000000..e953273
--- /dev/null
+++ b/tools/linguist/lupdate/lupdate.1
@@ -0,0 +1,132 @@
+.TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.\"
+.\" Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+.\" Contact: Qt Software Information (qt-info@nokia.com)
+.\"
+.\" This file may be distributed and/or modified under the terms of the
+.\" GNU General Public License version 2 as published by the Free Software
+.\" Foundation and appearing in the file LICENSE.GPL included in the
+.\" packaging of this file.
+.\"
+.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\" See http://qtsoftware.com/gpl/ for GPL licensing information.
+.\"
+.\" Contact qt-info@nokia.com if any conditions of this licensing are
+.\" not clear to you.
+.\"
+.SH NAME
+lupdate \- update Qt Linguist translation files
+.SH SYNOPSIS
+.B lupdate
+.RI "[ " options " ] " project-file
+.br
+.B lupdate
+.RI "[ " options " ] " source-files " -ts " ts-files
+.SH DESCRIPTION
+This page documents the
+.B Qt Linguist Update
+tool for the Qt GUI toolkit.
+.B Lupdate
+reads a qmake/tmake project file (.pro file), finds the translatable
+strings in the specified source, header and interface files, and
+updates the translation files (.ts files) specified in it. The
+translation files are given to the translator who uses
+.B Qt Linguist
+to read the files and insert the translations.
+.PP
+The .ts file format is a simple human-readable XML format that can be
+used with version control systems if required.
+.PP
+.SH OPTIONS
+.TP
+.I "-disable-heuristic {sametext|similartext|number}"
+Disable the named merge heuristic. Can be specified multiple times.
+.TP
+.I "-extensions <ext>[,<ext>...]"
+Process files with the given extensions only.
+The extension list must be separated with commas, not with whitespace.
+Default: 'ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx'.
+.TP
+.I "-help"
+Display the usage and exit.
+.TP
+.I "-locations {absolute|relative|none}"
+Specify/override how source code references are saved in ts files.
+Default is absolute.
+.TP
+.I "-no-obsolete"
+Drop all obsolete strings.
+.TP
+.I "-no-recursive"
+Do not recursively scan the following directories.
+.TP
+.I "-no-sort"
+Do not sort contexts in .ts files.
+.TP
+.I "-pluralonly"
+Only include plural form messages.
+.TP
+.I "-pro <filename>"
+Name of a .pro file. Useful for files with .pro
+file syntax but different file suffix
+.TP
+.I "-recursive"
+Recursively scan the following directories.
+.TP
+.I "-silent"
+Don't explain what is being done.
+.TP
+.I "-source-language <language>[_<region>]"
+Specify/override the language of the source strings. Defaults to
+POSIX if not specified and the file does not name it yet.
+.TP
+.I "-target-language <language>[_<region>]"
+Specify/override the language of the translation.
+The target language is guessed from the file name if this option
+is not specified and the file contents name no language yet.
+.I "-version"
+Display the version of
+.B lupdate
+and exit.
+.SH USAGE
+Here is an example .pro file that can be given to
+.B lupdate:
+.PP
+.in +4
+.nf
+HEADERS         = funnydialog.h \\
+                  wackywidget.h
+SOURCES         = funnydialog.cpp \\
+                  main.cpp \\
+                  wackywidget.cpp
+FORMS           = fancybox.ui
+TRANSLATIONS    = gnomovision_dk.ts \\
+                  gnomovision_fi.ts \\
+                  gnomovision_no.ts \\
+                  gnomovision_se.ts
+.fi
+.in -4
+.PP
+When running
+.B lupdate
+on this project file, the translatable strings in all the files
+listed in the HEADERS, SOURCES and FORMS entries will be put in
+the translation files listed in the TRANSLATIONS entry. Previous
+translations will be reused as far as possible, and translated
+strings that have vanished from the source files are marked obsolete.
+.PP
+.B lupdate
+can also be invoked with a list of C++ source files, .ui files
+and .ts files:
+.PP
+.in +4
+.nf
+lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts
+.fi
+.in -4
+.SH "SEE ALSO"
+.BR lrelease (1)
+and
+.BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/lupdate/lupdate.exe.manifest b/tools/linguist/lupdate/lupdate.exe.manifest
new file mode 100644
index 0000000..e0b2f73
--- /dev/null
+++ b/tools/linguist/lupdate/lupdate.exe.manifest
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <!-- Make sure Vista UAC does not believe lupdate is an installer -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
\ No newline at end of file
diff --git a/tools/linguist/lupdate/lupdate.pro b/tools/linguist/lupdate/lupdate.pro
new file mode 100644
index 0000000..b05a4ef
--- /dev/null
+++ b/tools/linguist/lupdate/lupdate.pro
@@ -0,0 +1,34 @@
+TEMPLATE        = app
+TARGET          = lupdate
+DESTDIR          = ../../../bin
+
+QT              -= gui
+
+CONFIG          += qt warn_on console
+CONFIG          -= app_bundle
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+include(../shared/formats.pri)
+include(../shared/proparser.pri)
+include(../shared/translatortools.pri)
+
+SOURCES += main.cpp
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+
+win32:RC_FILE = winmanifest.rc
+
+embed_manifest_exe:win32-msvc2005 {
+    # The default configuration embed_manifest_exe overrides the manifest file
+    # already embedded via RC_FILE. Vs2008 already have the necessary manifest entry
+    QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$DESTDIR/lupdate.exe -manifest \"$${PWD}\\lupdate.exe.manifest\")
+}
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS        += target
+
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
new file mode 100644
index 0000000..e7865d5
--- /dev/null
+++ b/tools/linguist/lupdate/main.cpp
@@ -0,0 +1,513 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "translator.h"
+#include "translatortools.h"
+#include "profileevaluator.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QTextCodec>
+
+static QString m_defaultExtensions;
+
+static void printOut(const QString & out)
+{
+    qWarning("%s", qPrintable(out));
+}
+
+static void recursiveFileInfoList(const QDir &dir,
+    const QStringList &nameFilters, QDir::Filters filter, bool recursive,
+    QFileInfoList *fileinfolist)
+{
+    if (recursive)
+        filter |= QDir::AllDirs;
+    QFileInfoList entries = dir.entryInfoList(nameFilters, filter);
+
+    QFileInfoList::iterator it;
+    for (it = entries.begin(); it != entries.end(); ++it) {
+        QString fname = it->fileName();
+        if (fname != QLatin1String(".") && fname != QLatin1String("..")) {
+            if (it->isDir())
+                recursiveFileInfoList(QDir(it->absoluteFilePath()), nameFilters, filter, recursive, fileinfolist);
+            else 
+                fileinfolist->append(*it);
+        }
+    }
+}
+
+static void printUsage()
+{
+    printOut(QObject::tr(
+        "Usage:\n"
+        "    lupdate [options] [project-file]\n"
+        "    lupdate [options] [source-file|path]... -ts ts-files\n\n"
+        "lupdate is part of Qt's Linguist tool chain. It can be used as a\n"
+        "stand-alone tool to create XML based translations files in the .ts\n"
+        "format from translatable messages in C++ and Java source code.\n\n"
+        "lupdate can also merge such messages into existing .ts files.\n\n"
+        "Options:\n"
+        "    -help  Display this information and exit.\n"
+        "    -no-obsolete\n"
+        "           Drop all obsolete strings.\n"
+        "    -extensions <ext>[,<ext>]...\n"
+        "           Process files with the given extensions only.\n"
+        "           The extension list must be separated with commas, not with whitespace.\n"
+        "           Default: '%1'.\n"
+        "    -pluralonly\n"
+        "           Only include plural form messages.\n"
+        "    -silent\n"
+        "           Do not explain what is being done.\n"
+        "    -no-sort\n"
+        "           Do not sort contexts in .ts files.\n"
+        "    -no-recursive\n"
+        "           Do not recursively scan the following directories.\n"
+        "    -recursive\n"
+        "           Recursively scan the following directories.\n"
+        "    -locations {absolute|relative|none}\n"
+        "           Specify/override how source code references are saved in ts files.\n"
+        "           Default is absolute.\n"
+        "    -no-ui-lines\n"
+        "           Do not record line numbers in references to .ui files.\n"
+        "    -disable-heuristic {sametext|similartext|number}\n"
+        "           Disable the named merge heuristic. Can be specified multiple times.\n"
+        "    -pro <filename>\n"
+        "           Name of a .pro file. Useful for files with .pro\n"
+        "           file syntax but different file suffix\n"
+        "    -source-language <language>[_<region>]\n"
+        "           Specify/override the language of the source strings. Defaults to\n"
+        "           POSIX if not specified and the file does not name it yet.\n"
+        "    -target-language <language>[_<region>]\n"
+        "           Specify/override the language of the translation.\n"
+        "           The target language is guessed from the file name if this option\n"
+        "           is not specified and the file contents name no language yet.\n"
+        "    -version\n"
+        "           Display the version of lupdate and exit.\n"
+    ).arg(m_defaultExtensions));
+}
+
+static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFileNames,
+    const QByteArray &codecForTr, const QString &sourceLanguage, const QString &targetLanguage,
+    UpdateOptions options, bool *fail)
+{
+    QDir dir;
+    QString err;
+    foreach (const QString &fileName, tsFileNames) {
+        QString fn = dir.relativeFilePath(fileName);
+        ConversionData cd;
+        Translator tor;
+        cd.m_sortContexts = !(options & NoSort);
+        if (QFile(fileName).exists()) {
+            if (!tor.load(fileName, cd, QLatin1String("auto"))) {
+                printOut(cd.error());
+                *fail = true;
+                continue;
+            }
+            cd.clearErrors();
+            if (!codecForTr.isEmpty() && codecForTr != tor.codecName())
+                qWarning("lupdate warning: Codec for tr() '%s' disagrees with "
+                         "existing file's codec '%s'. Expect trouble.",
+                         codecForTr.constData(), tor.codecName().constData());
+            if (!targetLanguage.isEmpty() && targetLanguage != tor.languageCode())
+                qWarning("lupdate warning: Specified target language '%s' disagrees with "
+                         "existing file's language '%s'. Ignoring.",
+                         qPrintable(targetLanguage), qPrintable(tor.languageCode()));
+            if (!sourceLanguage.isEmpty() && sourceLanguage != tor.sourceLanguageCode())
+                qWarning("lupdate warning: Specified source language '%s' disagrees with "
+                         "existing file's language '%s'. Ignoring.",
+                         qPrintable(sourceLanguage), qPrintable(tor.sourceLanguageCode()));
+        } else {
+            if (!codecForTr.isEmpty())
+                tor.setCodecName(codecForTr);
+            if (!targetLanguage.isEmpty())
+                tor.setLanguageCode(targetLanguage);
+            if (!sourceLanguage.isEmpty())
+                tor.setSourceLanguageCode(sourceLanguage);
+        }
+        tor.makeFileNamesAbsolute(QFileInfo(fileName).absoluteDir());
+        if (options & NoLocations)
+            tor.setLocationsType(Translator::NoLocations);
+        else if (options & RelativeLocations)
+            tor.setLocationsType(Translator::RelativeLocations);
+        else if (options & AbsoluteLocations)
+            tor.setLocationsType(Translator::AbsoluteLocations);
+        if (options & Verbose)
+            printOut(QObject::tr("Updating '%1'...\n").arg(fn));
+
+        if (tor.locationsType() == Translator::NoLocations) // Could be set from file
+            options |= NoLocations;
+        Translator out = merge(tor, fetchedTor, options, err);
+        if (!codecForTr.isEmpty())
+            out.setCodecName(codecForTr);
+
+        if ((options & Verbose) && !err.isEmpty()) {
+            printOut(err);
+            err.clear();
+        }
+        if (options & PluralOnly) {
+            if (options & Verbose)
+                printOut(QObject::tr("Stripping non plural forms in '%1'...\n").arg(fn));
+            out.stripNonPluralForms();
+        }
+        if (options & NoObsolete)
+            out.stripObsoleteMessages();
+        out.stripEmptyContexts();
+
+        if (!out.save(fileName, cd, QLatin1String("auto"))) {
+            printOut(cd.error());
+            *fail = true;
+        }
+    }
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    m_defaultExtensions = QLatin1String("ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx");
+
+    QStringList args = app.arguments();
+    QString defaultContext; // This was QLatin1String("@default") before.
+    Translator fetchedTor;
+    QByteArray codecForTr;
+    QByteArray codecForSource;
+    QStringList tsFileNames;
+    QStringList proFiles;
+    QStringList sourceFiles;
+    QString targetLanguage;
+    QString sourceLanguage;
+
+    UpdateOptions options =
+        Verbose | // verbose is on by default starting with Qt 4.2
+        HeuristicSameText | HeuristicSimilarText | HeuristicNumber;
+    int numFiles = 0;
+    bool standardSyntax = true;
+    bool metTsFlag = false;
+    bool recursiveScan = true;
+
+    QString extensions = m_defaultExtensions;
+    QStringList extensionsNameFilters;
+
+    for (int  i = 1; i < argc; ++i) {
+        if (args.at(i) == QLatin1String("-ts"))
+            standardSyntax = false;
+    }
+
+    for (int i = 1; i < argc; ++i) {
+        QString arg = args.at(i);
+        if (arg == QLatin1String("-help")
+                || arg == QLatin1String("--help")
+                || arg == QLatin1String("-h")) {
+            printUsage();
+            return 0;
+        } else if (arg == QLatin1String("-pluralonly")) {
+            options |= PluralOnly;
+            continue;
+        } else if (arg == QLatin1String("-noobsolete")
+                || arg == QLatin1String("-no-obsolete")) {
+            options |= NoObsolete;
+            continue;
+        } else if (arg == QLatin1String("-silent")) {
+            options &= ~Verbose;
+            continue;
+        } else if (arg == QLatin1String("-target-language")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The option -target-language requires a parameter.");
+                return 1;
+            }
+            targetLanguage = args[i];
+            continue;
+        } else if (arg == QLatin1String("-source-language")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The option -source-language requires a parameter.");
+                return 1;
+            }
+            sourceLanguage = args[i];
+            continue;
+        } else if (arg == QLatin1String("-disable-heuristic")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The option -disable-heuristic requires a parameter.");
+                return 1;
+            }
+            arg = args[i];
+            if (arg == QLatin1String("sametext")) {
+                options &= ~HeuristicSameText;
+            } else if (arg == QLatin1String("similartext")) {
+                options &= ~HeuristicSimilarText;
+            } else if (arg == QLatin1String("number")) {
+                options &= ~HeuristicNumber;
+            } else {
+                qWarning("Invalid heuristic name passed to -disable-heuristic.");
+                return 1;
+            }
+            continue;
+        } else if (arg == QLatin1String("-locations")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The option -locations requires a parameter.");
+                return 1;
+            }
+            if (args[i] == QLatin1String("none")) {
+                options |= NoLocations;
+            } else if (args[i] == QLatin1String("relative")) {
+                options |= RelativeLocations;
+            } else if (args[i] == QLatin1String("absolute")) {
+                options |= AbsoluteLocations;
+            } else {
+                qWarning("Invalid parameter passed to -locations.");
+                return 1;
+            }
+            continue;
+        } else if (arg == QLatin1String("-no-ui-lines")) {
+            options |= NoUiLines;
+            continue;
+        } else if (arg == QLatin1String("-verbose")) {
+            options |= Verbose;
+            continue;
+        } else if (arg == QLatin1String("-no-recursive")) {
+            recursiveScan = false;
+            continue;
+        } else if (arg == QLatin1String("-recursive")) {
+            recursiveScan = true;
+            continue;
+        } else if (arg == QLatin1String("-no-sort")
+                   || arg == QLatin1String("-nosort")) {
+            options |= NoSort;
+            continue;
+        } else if (arg == QLatin1String("-version")) {
+            printOut(QObject::tr("lupdate version %1\n").arg(QLatin1String(QT_VERSION_STR)));
+            return 0;
+        } else if (arg == QLatin1String("-ts")) {
+            metTsFlag = true;
+            continue;
+        } else if (arg == QLatin1String("-extensions")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The -extensions option should be followed by an extension list.");
+                return 1;
+            }
+            extensions = args[i];
+            continue;
+        } else if (arg == QLatin1String("-pro")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The -pro option should be followed by a filename of .pro file.");
+                return 1;
+            }
+            proFiles += args[i];
+            numFiles++;
+            continue;
+        } else if (arg.startsWith(QLatin1String("-")) && arg != QLatin1String("-")) {
+            qWarning("Unrecognized option '%s'", qPrintable(arg));
+            return 1;
+        }
+
+        numFiles++;
+
+        QString fullText;
+
+        codecForTr.clear();
+        codecForSource.clear();
+
+        if (metTsFlag) {
+            bool found = false;
+            foreach (const Translator::FileFormat &fmt, Translator::registeredFileFormats()) {
+                if (arg.endsWith(QLatin1Char('.') + fmt.extension, Qt::CaseInsensitive)) {
+                    QFileInfo fi(arg);
+                    if (!fi.exists() || fi.isWritable()) {
+                        tsFileNames.append(QFileInfo(arg).absoluteFilePath());
+                    } else {
+                        qWarning("lupdate warning: For some reason, '%s' is not writable.\n",
+                                qPrintable(arg));
+                    }
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                qWarning("lupdate error: File '%s' has no recognized extension\n",
+                         qPrintable(arg));
+                return 1;
+            }
+        } else if (arg.endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
+                || arg.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
+            proFiles << arg;
+        } else {
+            QFileInfo fi(arg);
+            if (!fi.exists()) {
+                qWarning("lupdate error: File '%s' does not exists\n", qPrintable(arg));
+                return 1;
+            } else if (fi.isDir()) {
+                if (options & Verbose)
+                    printOut(QObject::tr("Scanning directory '%1'...").arg(arg));
+                QDir dir = QDir(fi.filePath());
+                if (extensionsNameFilters.isEmpty()) {
+                    extensions = extensions.trimmed();
+                    // Remove the potential dot in front of each extension
+                    if (extensions.startsWith(QLatin1Char('.')))
+                        extensions.remove(0,1);
+                    extensions.replace(QLatin1String(",."), QLatin1String(","));
+
+                    extensions.insert(0, QLatin1String("*."));
+                    extensions.replace(QLatin1Char(','), QLatin1String(",*."));
+                    extensionsNameFilters = extensions.split(QLatin1Char(','));
+                }
+                QDir::Filters filters = QDir::Files | QDir::NoSymLinks;
+                QFileInfoList fileinfolist;
+                recursiveFileInfoList(dir, extensionsNameFilters, filters,
+                    recursiveScan, &fileinfolist);
+                QFileInfoList::iterator ii;
+                QString fn;
+                for (ii = fileinfolist.begin(); ii != fileinfolist.end(); ++ii) {
+                    // Make sure the path separator is stored with '/' in the ts file
+                    sourceFiles << ii->canonicalFilePath().replace(QLatin1Char('\\'), QLatin1Char('/'));
+                }
+            } else {
+                sourceFiles << fi.canonicalFilePath().replace(QLatin1Char('\\'), QLatin1Char('/'));
+            }
+        }
+    } // for args
+
+
+    bool firstPass = true;
+    bool fail = false;
+    while (firstPass || !proFiles.isEmpty()) {
+        ConversionData cd;
+        cd.m_defaultContext = defaultContext;
+        cd.m_noUiLines = options & NoUiLines;
+
+        QStringList tsFiles = tsFileNames;
+        if (proFiles.count() > 0) {
+            QFileInfo pfi(proFiles.takeFirst());
+            QHash<QByteArray, QStringList> variables;
+
+            ProFileEvaluator visitor;
+            visitor.setVerbose(options & Verbose);
+
+            ProFile pro(pfi.absoluteFilePath());
+            if (!visitor.queryProFile(&pro))
+                return 2;
+            if (!visitor.accept(&pro))
+                return 2;
+
+            if (visitor.templateType() == ProFileEvaluator::TT_Subdirs) {
+                QDir proDir(pfi.absoluteDir());
+                foreach (const QString &subdir, visitor.values(QLatin1String("SUBDIRS"))) {
+                    QString subPro = QDir::cleanPath(proDir.absoluteFilePath(subdir));
+                    QFileInfo subInfo(subPro);
+                    if (subInfo.isDir())
+                        proFiles << (subPro + QLatin1Char('/')
+                                     + subInfo.fileName() + QLatin1String(".pro"));
+                    else
+                        proFiles << subPro;
+                }
+                continue;
+            }
+
+            evaluateProFile(visitor, &variables);
+
+            sourceFiles = variables.value("SOURCES");
+
+            QStringList tmp = variables.value("CODECFORTR");
+            if (!tmp.isEmpty() && !tmp.first().isEmpty()) {
+                codecForTr = tmp.first().toLatin1();
+                fetchedTor.setCodecName(codecForTr);
+            }
+            tmp = variables.value("CODECFORSRC");
+            if (!tmp.isEmpty() && !tmp.first().isEmpty()) {
+                codecForSource = tmp.first().toLatin1();
+                if (!QTextCodec::codecForName(codecForSource))
+                    qWarning("lupdate warning: Codec for source '%s' is invalid. Falling back to codec for tr().",
+                             codecForSource.constData());
+                else
+                    cd.m_codecForSource = codecForSource;
+            }
+
+            tsFiles += variables.value("TRANSLATIONS");
+        }
+
+        for (QStringList::iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) {
+            if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive)) {
+                cd.m_sourceFileName = *it;
+                fetchedTor.load(*it, cd, QLatin1String("java"));
+                //fetchtr_java(*it, &fetchedTor, defaultContext, true, codecForSource);
+            }
+            else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)) {
+                fetchedTor.load(*it, cd, QLatin1String("ui"));
+                //fetchedTor.load(*it + QLatin1String(".h"), cd, QLatin1String("cpp"));
+                //fetchtr_ui(*it, &fetchedTor, defaultContext, true);
+                //fetchtr_cpp(*it + QLatin1String(".h"), &fetchedTor,
+                //             defaultContext, false, codecForSource);
+            }
+            else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive)
+                || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive)) {
+                fetchedTor.load(*it, cd, QLatin1String("js"));
+            } else {
+                fetchedTor.load(*it, cd, QLatin1String("cpp"));
+                //fetchtr_cpp(*it, &fetchedTor, defaultContext, true, codecForSource);
+            }
+        }
+        if (!cd.error().isEmpty())
+            printOut(cd.error());
+
+        tsFiles.sort();
+        tsFiles.removeDuplicates();
+
+        if (!tsFiles.isEmpty())
+            updateTsFiles(fetchedTor, tsFiles, codecForTr, sourceLanguage, targetLanguage, options, &fail);
+
+        firstPass = false;
+    }
+
+    if (numFiles == 0) {
+        printUsage();
+        return 1;
+    }
+
+    return fail ? 1 : 0;
+}
diff --git a/tools/linguist/lupdate/winmanifest.rc b/tools/linguist/lupdate/winmanifest.rc
new file mode 100644
index 0000000..45c4935
--- /dev/null
+++ b/tools/linguist/lupdate/winmanifest.rc
@@ -0,0 +1,4 @@
+#define RT_MANIFEST 24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lupdate.exe.manifest"