Merge lp:~akiva/qtcreator-plugin-autopilot/fix-segfault-fix-winsize into lp:qtcreator-plugin-autopilot

[Akiva]

    State:
    - Stable, needs testing
    - Should merge in trunk

    Changelog:
    - Fixed a segmentation fault, that would happen if you activated the locator without a project open
    - Set the window dimensions so the window is no longer needlessly bigger than the touch interface displayed within.

    Todo:
    - Fix ID issues
    - Deduplicate code
    - Fix QMake Projects
    - Refresh Testlist to be asynchronous
    - Explore restoring runconfig

    State:
    - Stable, needs testing
    - Should merge in trunk

    Changelog:
    - Fixed a segmentation fault, that would happen if you activated the locator without a project open
    - Set the window dimensions so the window is no longer needlessly bigger than the touch interface displayed within.

    Todo:
    - Fix ID issues
    - Deduplicate code
    - Fix QMake Projects
    - Refresh Testlist to be asynchronous
    - Explore restoring runconfig

[Benjamin Zeller (zeller-benjamin)]

OK

review: Approve

=== modified file 'src/autopilot/autopilotlocator.cpp'
--- src/autopilot/autopilotlocator.cpp	2015-07-01 15:15:55 +0000
+++ src/autopilot/autopilotlocator.cpp	2015-07-02 04:20:50 +0000
@@ -33,6 +33,9 @@
 QList<Core::LocatorFilterEntry> AutopilotLocator::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) {
 
 	QList<Core::LocatorFilterEntry> locatorEntries; // Local, as you do not want to edit the static entry, s_LocatorEntries
+	if (!ProjectExplorer::ProjectExplorerPlugin::instance()->currentProject()) {
+		return locatorEntries;
+	}
 	int ii;
 
 	for (int i = 0; ProjectExplorer::ProjectExplorerPlugin::instance()->currentProject()->activeTarget()->runConfigurations().length() > i; i++) {
@@ -55,7 +58,7 @@
 
 	/* Temporarily set the Run configuration to run the one test */
 	qvariant_cast<AutopilotRunConfiguration*>(selection.internalData)
-			->setCommandLineArguments(tr("-X ")
+			->setCommandLineArguments(tr("-X -s 320x600x24 ")
 						  + selection.displayName
 						  + tr(".tests.test_")
 						  + selection.extraInfo.split(tr("    |    ")).first());
@@ -95,7 +98,7 @@
 		,this
 		,SLOT(resetTestList(QObject*)));
 
-	static_cast<AutopilotRunConfiguration*>(arc)->setCommandLineArguments(tr("-X ")
+	static_cast<AutopilotRunConfiguration*>(arc)->setCommandLineArguments(tr("-X -s 320x600x24 ")
 						  + static_cast<AutopilotRunConfiguration*>(arc)->checkedTests()
 						  .join(tr(" ")));
 

=== modified file 'src/autopilot/autopilotrunconfiguration.cpp'
--- src/autopilot/autopilotrunconfiguration.cpp	2015-07-01 15:15:55 +0000
+++ src/autopilot/autopilotrunconfiguration.cpp	2015-07-02 04:20:50 +0000
@@ -415,7 +415,7 @@
 		m_CheckedTests.removeAll(test->text());
 	}
 
-	setCommandLineArguments(tr("-X ") + m_CheckedTests.join(tr(" ")));
+	setCommandLineArguments(tr("-X -s 320x600x24 ") + m_CheckedTests.join(tr(" ")));
 	return;
 }
 void AutopilotRunConfiguration::refreshTestList(QWidget * widget) {
@@ -490,7 +490,7 @@
 		adjustTestList(autopilotCheckListTest);
 
 	}
-	setCommandLineArguments(tr("-X ") + m_CheckedTests.join(tr(" ")));
+	setCommandLineArguments(tr("-X -s 320x600x24 ") + m_CheckedTests.join(tr(" ")));
 
 	/* Repopulate Locator */
 	setTestList(module());
@@ -532,7 +532,7 @@
 		autopilotCheckListTest->setCheckState(Qt::Checked);
 		adjustTestList(autopilotCheckListTest);
 	}
-	setCommandLineArguments(tr("-X ") + m_CheckedTests.join(tr(" ")));
+	setCommandLineArguments(tr("-X -s 320x600x24 ") + m_CheckedTests.join(tr(" ")));
 
 	return autopilotSettingsWidget;
 }