Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove test cases which cause stack overflow
  Fix compile errors
  Run autotests with minimal capabilities
  Documentation updates for Qt/Symbian on Linux development
  Allow EPOCROOT env var to be without trailing slash.
  Workaround for Symbian Open C bug in socket connect.
  Fix fetchedRoot test variable to work also in Symbian
  Add configure time checks for symbian environment
  Check for existance of sis file parameter to runonphone
  Fix thread synchronization issues in Symbian QFileSystemWatcher
  Disable compiling of the plugin when extra package not found
  Added missing UID3 for qsymbianbearer.dll.
  Enabled previously disabled Qt features.
  Fix includes so it compiles
  Use lowercase includes so it compiles in Linux too
  Fixed library dependency for Gnupoc.
  Removed the --export_all_vtbl from linking.
  Cleaned up the elf2e32 options a bit.

1 files changed, 4 insertions, 0 deletions

diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp
index 37e4548..885d029 100644
--- a/tools/runonphone/main.cpp
+++ b/tools/runonphone/main.cpp
@@ -102,6 +102,10 @@ int main(int argc, char *argv[])
             else if (arg == "--sis" || arg == "-s") {
                 CHECK_PARAMETER_EXISTS
                 sisFile = it.next();
+                if (!QFileInfo(sisFile).exists()) {
+                    errstream << "Sis file (" << sisFile << ") doesn't exist" << endl;
+                    return 1;
+                }
             }
             else if (arg == "--download" || arg == "-d") {
                 CHECK_PARAMETER_EXISTS