Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.1-integration

* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
  Fixed  syntax errrors in system tests

18 files changed, 68 insertions, 30 deletions

diff --git a/tests/systemtests/sys_bearer/sys_bearer.qtt b/tests/systemtests/sys_bearer/sys_bearer.qtt
index b68823efe6..e90b922a1e 100644
--- a/tests/systemtests/sys_bearer/sys_bearer.qtt
+++ b/tests/systemtests/sys_bearer/sys_bearer.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_contacts/sys_contacts.qtt b/tests/systemtests/sys_contacts/sys_contacts.qtt
index df70668bb0..34f7a3b8a6 100644
--- a/tests/systemtests/sys_contacts/sys_contacts.qtt
+++ b/tests/systemtests/sys_contacts/sys_contacts.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt b/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
index c2e64fbe49..dda65a297d 100644
--- a/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
+++ b/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -63,7 +63,7 @@ testcase = {
     1 Verify that the storage disappears or marked unavailable
     1 *Note:* On S60 platforms removing a media might cause qsysinfo to be closed, which is usual
         '));
-    }
+    },
 
     Query_OS_Qt_firmware_versions: function()
     {
@@ -80,7 +80,7 @@ testcase = {
     1 From the *Version* pulldown menu select *QtMobility*
     1 Verify the QtMobility version is what is expected
         '));
-    }
+    },
 
     Query_device_hardware_features: function()
     {
diff --git a/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt b/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
index 6aa85ebab0..e0e027adcc 100644
--- a/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
+++ b/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_declarative-sfw-notes/sys_declarative-sfw-notes.qtt b/tests/systemtests/sys_declarative-sfw-notes/sys_declarative-sfw-notes.qtt
index b4d8c10fee..ffaa4d9b02 100644
--- a/tests/systemtests/sys_declarative-sfw-notes/sys_declarative-sfw-notes.qtt
+++ b/tests/systemtests/sys_declarative-sfw-notes/sys_declarative-sfw-notes.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_feedback/sys_feedback.qtt b/tests/systemtests/sys_feedback/sys_feedback.qtt
index 94871013d6..c07fd6b86e 100644
--- a/tests/systemtests/sys_feedback/sys_feedback.qtt
+++ b/tests/systemtests/sys_feedback/sys_feedback.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_location/sys_location.qtt b/tests/systemtests/sys_location/sys_location.qtt
index 639a6f652f..5c622e45d0 100644
--- a/tests/systemtests/sys_location/sys_location.qtt
+++ b/tests/systemtests/sys_location/sys_location.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_messaging/sys_messaging.qtt b/tests/systemtests/sys_messaging/sys_messaging.qtt
index 34e044d03a..712c15c2fe 100644
--- a/tests/systemtests/sys_messaging/sys_messaging.qtt
+++ b/tests/systemtests/sys_messaging/sys_messaging.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -892,10 +892,8 @@ http://www.google.com/      1. return to search results
           }
       },
 
-
-
  
-*/
+/*
     New tests proposed
       bluewheelMessaging_Search_Messages_By_Type
       bluewheelMessaging_Search_Messages_By_Priority
diff --git a/tests/systemtests/sys_multimedia/sys_multimedia.qtt b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
index 0a6858ef5e..2ce5b335ac 100644
--- a/tests/systemtests/sys_multimedia/sys_multimedia.qtt
+++ b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_oopserviceframework/sys_oopserviceframework.qtt b/tests/systemtests/sys_oopserviceframework/sys_oopserviceframework.qtt
index 0c677b1436..747a41295a 100644
--- a/tests/systemtests/sys_oopserviceframework/sys_oopserviceframework.qtt
+++ b/tests/systemtests/sys_oopserviceframework/sys_oopserviceframework.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_organizer/sys_organizer.qtt b/tests/systemtests/sys_organizer/sys_organizer.qtt
index 9d3ef0e4e4..e0b5d1e4ab 100644
--- a/tests/systemtests/sys_organizer/sys_organizer.qtt
+++ b/tests/systemtests/sys_organizer/sys_organizer.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
index ca0f23f4fe..23e58ec8e6 100644
--- a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
+++ b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 //TESTED_COMPONENT=src/contacts
 
diff --git a/tests/systemtests/sys_sensors/sys_sensors.qtt b/tests/systemtests/sys_sensors/sys_sensors.qtt
index f5b96403a3..780cfecdc3 100644
--- a/tests/systemtests/sys_sensors/sys_sensors.qtt
+++ b/tests/systemtests/sys_sensors/sys_sensors.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -175,7 +175,7 @@ Note:
     | Invert device on y axis to vertical | Verify that device recognizes that it is *Right Up*, y slider should be in left position and y = -90 |
     | Turn device upside down (face down) | Verify that device recognizes that it is *Face Down*, y slider should be changing from extreme right to extreme left, and y = -180/+ 180  |
     | Return device to the starting position | Verify that device recognizes that it is *Face Up*, all sliders should be in middle position |
-    | On Harmattan/Meggo devices, z will not change during this test given there is hardware support, this doesn't apply to Symbian devices and N900. |  |
+    | On Harmattan/Meggo devices, z will not change during this test given there is hardware support, this does not apply to Symbian devices and N900. |  |
         '));
     },
 
@@ -191,7 +191,7 @@ Note:
     | Position device flat on its x axis | Verify the values displayed are close to: x=9.8, y=0, z=0 |
     | Position device flat on its z axis | Verify the values displayed are close to: x=0, y=0, z=9.8 |
             '));
-     }
+     },
 
     Sym_Tap : function()
     {
@@ -205,7 +205,7 @@ Note:
     | select *reading properties* tab ||
     | double tap on the device | Verify the values displayed are changed |
             '));
-     }
+     },
 
     Sym_Orientation : function()
     {
@@ -219,7 +219,7 @@ Note:
     | select *reading properties* tab ||
     | slowly rotate the device | Verify the values displayed are changed accordingly |
             '));
-     }
+     },
 
     Sym_MagnetoMeter : function()
     {
@@ -233,7 +233,7 @@ Note:
     | select *reading properties* tab ||
     | put the device closer to a iron or steel object | Verify the values displayed are changed accordingly |
             '));
-     }
+     },
 
     Sym_Compass : function()
     {
@@ -247,7 +247,7 @@ Note:
     | select *reading properties* tab ||
     | slowly turn the device around | Verify the values displayed are changed accordingly |
             '));
-     }
+     },
 
     Sym_Lux : function()
     {
@@ -261,7 +261,7 @@ Note:
     | select *reading properties* tab ||
     | change the luminance value around the device | verify the values displayed are changed accordingly |
             '));
-     }
+     },
 
     Sym_Dynamic : function()
     {
@@ -275,7 +275,7 @@ Note:
     | select *reading properties* tab ||
     | change the sensor value depends on the sensor type | verify the values displayed are changed accordingly |
             '));
-     }
+     },
 
     Sym_Gyroscope : function()
     {
diff --git a/tests/systemtests/sys_systeminfo/sys_systeminfo.qtt b/tests/systemtests/sys_systeminfo/sys_systeminfo.qtt
index 8617262af5..4bca0f20f4 100644
--- a/tests/systemtests/sys_systeminfo/sys_systeminfo.qtt
+++ b/tests/systemtests/sys_systeminfo/sys_systeminfo.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_tactilefeedback/sys_tactilefeedback.qtt b/tests/systemtests/sys_tactilefeedback/sys_tactilefeedback.qtt
index c3756feed3..cdbe0466d7 100644
--- a/tests/systemtests/sys_tactilefeedback/sys_tactilefeedback.qtt
+++ b/tests/systemtests/sys_tactilefeedback/sys_tactilefeedback.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_telephony/sys_telephony.qtt b/tests/systemtests/sys_telephony/sys_telephony.qtt
index ffe33dbb06..f14c6a0a04 100644
--- a/tests/systemtests/sys_telephony/sys_telephony.qtt
+++ b/tests/systemtests/sys_telephony/sys_telephony.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_versit/sys_versit.qtt b/tests/systemtests/sys_versit/sys_versit.qtt
index f6155a3345..f02e2f1fcc 100644
--- a/tests/systemtests/sys_versit/sys_versit.qtt
+++ b/tests/systemtests/sys_versit/sys_versit.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
diff --git a/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt b/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
index de0766b778..033a919c83 100644
--- a/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
+++ b/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.