Merge branch 'master' of https://vcs.maemo.org/git/situare

Updates from debianizing.
Conflicts:
	Situare.pro

diff --cc tests/testUI/testUI/testui.cpp
index da311e6,0000000..25334b0
mode 100755,000000..100755
--- 1/tests/testUI/testUI/testui.cpp
--- /dev/null
+++ b/tests/testUI/testUI/testui.cpp
@@@ -1,47 -1,0 +1,45 @@@
 +/*
 +    Situare - A location system for Facebook
 +    Copyright (C) 2010  Ixonos Plc. Authors:
 +
 +       Henri Lampela - henri.lampela@ixonos.com
 +
 +    Situare is free software; you can redistribute it and/or
 +    modify it under the terms of the GNU General Public License
 +    version 2 as published by the Free Software Foundation.
 +
 +    Situare is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +    GNU General Public License for more details.
 +
 +    You should have received a copy of the GNU General Public License
 +    along with Situare; if not, write to the Free Software
 +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 +    USA.
 + */
 +
 +#include <QtGui>
 +#include <QtTest/QtTest>
 +#include "../../../src/ui/mainwindow.h"
 +
 +class TestUi: public QObject
 +{
 +    Q_OBJECT
 +
 +private slots:
 +    void testUi();
- 
- 
 +};
 +
 +void TestUi::testUi()
 +{
 +    QLineEdit lineEdit;
 +
 +    QTest::keyClicks(&lineEdit, "UI tests");
 +
 +    QCOMPARE(lineEdit.text(), QString("UI test"));
 +}
 +
 +
 +QTEST_MAIN(TestUi)
 +#include "testui.moc"