final fixing after merge

diff --git a/doc/test_cases/functionality-tests.doc b/doc/test_cases/functionality-tests.doc
index aea4bbf..e409111 100644 (file)
Binary files a/doc/test_cases/functionality-tests.doc and b/doc/test_cases/functionality-tests.doc differ

diff --git a/tests/map/mapview/mapview.pro b/tests/map/mapview/mapview.pro
index aa145fa..e8234b4 100644 (file)
--- a/tests/map/mapview/mapview.pro
+++ b/tests/map/mapview/mapview.pro
@@ -2,7 +2,7 @@
 # Automatically generated by qmake (2.01a) Fri Mar 26 15:22:56 2010
 # #####################################################################
 CONFIG += qtestlib
-QT += opengl
+#QT += opengl
 TEMPLATE = app
 TARGET = 
 DEPENDPATH += .

diff --git a/tests/map/uselastlocation/testuselastlocation.cpp b/tests/map/uselastlocation/testuselastlocation.cpp
index 15f2156..164edd3 100644 (file)
--- a/tests/map/uselastlocation/testuselastlocation.cpp
+++ b/tests/map/uselastlocation/testuselastlocation.cpp
@@ -67,8 +67,7 @@ class TestUseLastPosition: public QObject
      // Check parameters of sended signals
      QList<QVariant> parameters = mapEngineSpy.takeFirst();
      QVERIFY(parameters.at(0).toInt() == DEFAULT_TEST_ZOOMLEVEL);
-//     parameters = mapEngineSpy.takeFirst();
-//     QVERIFY(parameters.at(0).toInt() == 0);
+
      parameters = mapEngineSpy.takeFirst();
      QVERIFY(parameters.at(0).toInt() == DEFAULT_START_ZOOM_LEVEL);
 

diff --git a/tests/map/uselastlocation/uselastlocation.pro b/tests/map/uselastlocation/uselastlocation.pro
index 8d92a32..4dcdbd8 100644 (file)
--- a/tests/map/uselastlocation/uselastlocation.pro
+++ b/tests/map/uselastlocation/uselastlocation.pro
@@ -26,12 +26,10 @@ SOURCES += testuselastlocation.cpp \
     ../../../src/map/friendlocationitem.cpp \
     ../../../src/map/friendgroupitem.cpp \
     ../../../src/ui/mainwindow.cpp \
-    ../../../src/ui/mapviewscreen.cpp \
     ../../../src/ui/settingsdialog.cpp \
     ../../../src/ui/logindialog.cpp \
     ../../../src/map/mapview.cpp \
     ../../../src/ui/friendlistpanel.cpp \
-    ../../../src/ui/userpanel.cpp \
     ../../../src/ui/panelsidebar.cpp \
     ../../../src/ui/zoombuttonpanel.cpp \
     ../../../src/ui/friendlistview.cpp \
@@ -40,7 +38,10 @@ SOURCES += testuselastlocation.cpp \
     ../../../src/ui/userinfo.cpp \
     ../../../src/ui/imagebutton.cpp \
     ../../../src/ui/updatelocation/updatelocationdialog.cpp \
-    ../../../src/ui/updatelocation/texteditautoresizer.cpp
+    ../../../src/ui/updatelocation/texteditautoresizer.cpp \
+    ../../../src/ui/userinfopanel.cpp \
+    ../../../src/ui/sidepanel.cpp \
+    ../../../src/ui/zoombutton.cpp
 
 HEADERS += ../../../src/map/mapengine.h \
     ../../../src/map/mapscene.h \
@@ -55,12 +56,10 @@ HEADERS += ../../../src/map/mapengine.h \
     ../../../src/map/friendlocationitem.h \
     ../../../src/map/friendgroupitem.h \
     ../../../src/ui/mainwindow.h \
-    ../../../src/ui/mapviewscreen.h \
     ../../../src/ui/settingsdialog.h \
     ../../../src/ui/logindialog.h \
     ../../../src/map/mapview.h \
     ../../../src/ui/friendlistpanel.h \
-    ../../../src/ui/userpanel.h \
     ../../../src/ui/panelsidebar.h \
     ../../../src/ui/zoombuttonpanel.h \
     ../../../src/ui/friendlistview.h \
@@ -69,7 +68,10 @@ HEADERS += ../../../src/map/mapengine.h \
     ../../../src/ui/userinfo.h \
     ../../../src/ui/imagebutton.h \
     ../../../src/ui/updatelocation/updatelocationdialog.h \
-    ../../../src/ui/updatelocation/texteditautoresizer.h
+    ../../../src/ui/updatelocation/texteditautoresizer.h \
+    ../../../src/ui/userinfopanel.h \
+    ../../../src/ui/sidepanel.h \
+    ../../../src/ui/zoombutton.h
 
 
 

diff --git a/tests/tests.pro b/tests/tests.pro
index 990fbc4..f4aeb0c 100644 (file)
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -7,6 +7,7 @@ SUBDIRS = map/mapengine \
           map/friendgroupitem \
           map/mapscene \
           map/friendlocationitem \
+          map/uselastlocation \
           user \
           ui/friendlist \
           ui/zoombuttonpanel