Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

1 files changed, 87 insertions, 0 deletions

diff --git a/tests/auto/linguist/lupdate/testlupdate.h b/tests/auto/linguist/lupdate/testlupdate.h
new file mode 100644
index 0000000..efe9d85
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testlupdate.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TESTLUPDATE_H
+#define TESTLUPDATE_H
+
+#include <QObject>
+#include <QProcess>
+#include <QStringList>
+
+class TestLUpdate : public QObject
+{
+    Q_OBJECT
+
+public:
+    TestLUpdate();
+    virtual ~TestLUpdate();
+
+    void setWorkingDirectory( const QString &workDir);
+    bool run( const QString &commandline);
+    bool updateProFile( const QString &arguments);
+    bool qmake();
+    QStringList getErrorMessages() {
+        return make_result;
+    }
+    void clearResult() {
+        make_result.clear();
+    }
+private:
+    QString     m_cmdLupdate;
+    QString     m_cmdQMake;
+    QString     m_workDir;
+    QProcess	*childProc;
+    QStringList env_list;
+    QStringList make_result;
+
+    bool	child_show;
+    bool    qws_mode;
+    bool	exit_ok;
+
+    bool runChild( bool showOutput, const QString &program, const QStringList &argList = QStringList());
+    void addMakeResult( const QString &result );
+    void childHasData();
+
+private slots:
+    void childReady(int exitCode);
+};
+
+#endif // TESTLUPDATE_H