BUG: Ensure Qt reserved arguments are passed to the launched application

This commit adds a test checking that Qt reserved arguments are effectively
passed to the launched application. It fixes a regression likely introduced
in 36e8c12 (Don't instantiate QApplication if no splash screen is used).

Author: jcfr

Base/ctkAppLauncher.cpp

@@ -993,7 +993,7 @@ void ctkAppLauncher::setApplication(const QCoreApplication& app)
 {
   Q_D(ctkAppLauncher);
   d->Application = app.instance();
-  if (d->Application)
+  if (d->Application && d->Arguments.empty())
     {
     this->setArguments(d->Application->arguments());
     }

Testing/Launcher/App4Test/Main.cpp.in

@@ -220,6 +220,36 @@ int main(int argc, char** argv)
         return EXIT_FAILURE;
         }
       }
+    else if (argName == "--check-reserved-argument")
+      {
+      std::string expectedArgName2("-widgetcount");
+      int expectedArgCount = 3;
+      if (argc != expectedArgCount)
+        {
+        std::cerr << "Unexpected number of arguments"
+                  << "\n\texpected: " << expectedArgCount
+                  << "\n\t current: " << argc
+                  << std::endl;
+        std::cerr << "Argument passed:" << argName;
+        for(int i=2; i < argc; i++)
+          {
+          std::cerr << " " << argv[i];
+          }
+        std::cerr << std::endl;
+        return EXIT_FAILURE;
+        }
+      std::string argName2(argv[2]);
+      if (argName2 != expectedArgName2)
+        {
+        std::cerr << "Unexpected argument #2:"
+          << "\n\texpected: " << expectedArgName2
+          << "\n\t current: " << argName2
+          << std::endl;
+        display_arguments(std::cerr, argc, argv);
+        return EXIT_FAILURE;
+        }
+      std::cout << expectedArgName2 << " argument passed" << std::endl;
+      }
     }
   else if (argc == 1)
     {

Testing/Launcher/AppLauncher-Param-TestQtReservedArgs.cmake

@@ -18,8 +18,9 @@ size=1
 set(PRINT_COMMAND 0)
 
 # --------------------------------------------------------------------------
-# Make sure the launcher do not consider Qt reserved argument
-set(command ${launcher_exe} -widgetcount --launcher-no-splash)
+# Make sure that (1) the launcher do not consider Qt reserved argument
+# and (2) the launched application consider Qt reserved argument
+set(command ${launcher_exe} --check-reserved-argument -widgetcount)
 execute_process(
   COMMAND ${command}
   WORKING_DIRECTORY ${launcher_binary_dir}
@@ -39,3 +40,6 @@ if("${ev}" MATCHES "Widgets left.*")
   message(FATAL_ERROR "error_variable [${ev}] shouldn't contain 'Widgets left'")
 endif()
 
+if(NOT "${ov}" MATCHES "-widgetcount argument passed")
+  message(FATAL_ERROR "output_variable [${ov}] should contain '-widgetcount argument passed'")
+endif()

Testing/Launcher/CMakeLists.txt

@@ -147,6 +147,7 @@ applauncher_add_test(AppLauncher-Param-TestLauncherTimeout)
 applauncher_add_test(AppLauncher-Param-TestLauncherVerbose)
 applauncher_add_test(AppLauncher-Param-TestLauncherVersion)
 applauncher_add_test(AppLauncher-Param-TestQtReservedArgs)
+set_property(TEST "${testname}" APPEND PROPERTY LABELS "XDisplayRequired")
 
 applauncher_add_test(AppLauncher-Settings-TestApplicationArguments)
 applauncher_add_test(AppLauncher-Settings-TestApplicationPath)