feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
This commit is contained in:
Oswald Buddenhagen
2014-03-27 18:20:00 +01:00
parent 187bb36945 0afa004c0b
commit f013c41d05
272 changed files with 8516 additions and 10735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/plugins/qnx/qnxplugin.cpp
View File

@@ -77,23 +77,24 @@
using namespace Qnx::Internal;
QNXPlugin::QNXPlugin()
QnxPlugin::QnxPlugin()
: m_debugSeparator(0)
, m_attachToQnxApplication(0)
{
}
QNXPlugin::~QNXPlugin()
QnxPlugin::~QnxPlugin()
{
delete BlackBerryDeviceConnectionManager::instance();
}
bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
{
Q_UNUSED(arguments)
Q_UNUSED(errorString)
// Handles BlackBerry
addAutoReleasedObject(new BlackBerryConfigurationManager);
addAutoReleasedObject(new BlackBerryQtVersionFactory);
addAutoReleasedObject(new BlackBerryDeployConfigurationFactory);
addAutoReleasedObject(new BlackBerryDeviceConfigurationFactory);
@@ -136,12 +137,13 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
}
addAutoReleasedObject(new BarDescriptorEditorFactory);
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()), &BlackBerryConfigurationManager::instance(), SLOT(loadSettings()));
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
BlackBerryConfigurationManager::instance(), SLOT(loadSettings()));
return true;
}
void QNXPlugin::extensionsInitialized()
void QnxPlugin::extensionsInitialized()
{
ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
tr("BAR Descriptor"));
@@ -164,12 +166,12 @@ void QNXPlugin::extensionsInitialized()
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions()));
}
ExtensionSystem::IPlugin::ShutdownFlag QNXPlugin::aboutToShutdown()
ExtensionSystem::IPlugin::ShutdownFlag QnxPlugin::aboutToShutdown()
{
return SynchronousShutdown;
}
void QNXPlugin::updateDebuggerActions()
void QnxPlugin::updateDebuggerActions()
{
bool hasValidQnxKit = false;
ProjectExplorer::DeviceTypeMatcher qnxTypeMatcher(Constants::QNX_QNX_OS_TYPE);
@@ -191,7 +193,7 @@ void QNXPlugin::updateDebuggerActions()
#include "bardescriptordocument.h"
void QNXPlugin::testBarDescriptorDocumentSetValue_data()
void QnxPlugin::testBarDescriptorDocumentSetValue_data()
{
QTest::addColumn<BarDescriptorDocument::Tag>("tag");
QTest::addColumn<QVariant>("value");
@@ -362,7 +364,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue_data()
<< true;
}
void QNXPlugin::testBarDescriptorDocumentSetValue()
void QnxPlugin::testBarDescriptorDocumentSetValue()
{
QFETCH(BarDescriptorDocument::Tag, tag);
QFETCH(QVariant, value);
@@ -381,7 +383,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue()
QCOMPARE(doc.value(tag), value);
}
void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data()
void QnxPlugin::testBarDescriptorDocumentSetBannerComment_data()
{
QTest::addColumn<QString>("comment");
QTest::addColumn<QString>("baseXml");
@@ -426,7 +428,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data()
}
void QNXPlugin::testBarDescriptorDocumentSetBannerComment()
void QnxPlugin::testBarDescriptorDocumentSetBannerComment()
{
QFETCH(QString, comment);
QFETCH(QString, baseXml);
@@ -442,7 +444,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment()
QCOMPARE(doc.bannerComment(), comment);
}
void QNXPlugin::testConfigurationManager_data()
void QnxPlugin::testConfigurationManager_data()
{
const QLatin1String NDKEnvFileKey("NDKEnvFile");
const QLatin1String NDKPathKey("NDKPath");
@@ -479,14 +481,14 @@ void QNXPlugin::testConfigurationManager_data()
QTest::newRow("configurations") << newerConfiguration << olderConfiguration;;
}
void QNXPlugin::testConfigurationManager()
void QnxPlugin::testConfigurationManager()
{
BlackBerryConfigurationManager &manager = BlackBerryConfigurationManager::instance();
BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance();
QCOMPARE(manager.apiLevels().count(), 0);
QCOMPARE(manager.activeApiLevels().count(), 0);
QCOMPARE(manager.defaultApiLevel(), static_cast<BlackBerryApiLevelConfiguration*>(0));
QVERIFY(manager.newestApiLevelEnabled());
QCOMPARE(manager->apiLevels().count(), 0);
QCOMPARE(manager->activeApiLevels().count(), 0);
QCOMPARE(manager->defaultApiLevel(), static_cast<BlackBerryApiLevelConfiguration*>(0));
QVERIFY(manager->newestApiLevelEnabled());
QFETCH(QVariantMap, newerConfiguration);
QFETCH(QVariantMap, olderConfiguration);
@@ -497,34 +499,34 @@ void QNXPlugin::testConfigurationManager()
BlackBerryApiLevelConfiguration *oldConfig =
new BlackBerryApiLevelConfiguration(olderConfiguration);
QVERIFY(manager.addApiLevel(oldConfig));
QVERIFY(manager.newestApiLevelEnabled());
QCOMPARE(manager.defaultApiLevel(), oldConfig);
QVERIFY(manager->addApiLevel(oldConfig));
QVERIFY(manager->newestApiLevelEnabled());
QCOMPARE(manager->defaultApiLevel(), oldConfig);
manager.setDefaultConfiguration(oldConfig);
manager->setDefaultConfiguration(oldConfig);
QCOMPARE(manager.defaultApiLevel(), oldConfig);
QCOMPARE(manager.apiLevels().first(), oldConfig);
QVERIFY(!manager.newestApiLevelEnabled());
QCOMPARE(manager->defaultApiLevel(), oldConfig);
QCOMPARE(manager->apiLevels().first(), oldConfig);
QVERIFY(!manager->newestApiLevelEnabled());
QVERIFY(manager.addApiLevel(newerConfig));
QCOMPARE(manager.apiLevels().first(), newerConfig);
QCOMPARE(manager.defaultApiLevel(), oldConfig);
QVERIFY(manager->addApiLevel(newerConfig));
QCOMPARE(manager->apiLevels().first(), newerConfig);
QCOMPARE(manager->defaultApiLevel(), oldConfig);
manager.setDefaultConfiguration(0);
QVERIFY(manager.newestApiLevelEnabled());
QCOMPARE(manager.defaultApiLevel(), newerConfig);
manager->setDefaultConfiguration(0);
QVERIFY(manager->newestApiLevelEnabled());
QCOMPARE(manager->defaultApiLevel(), newerConfig);
manager.setDefaultConfiguration(oldConfig);
manager.removeApiLevel(oldConfig);
QCOMPARE(manager.defaultApiLevel(), newerConfig);
QVERIFY(manager.newestApiLevelEnabled());
manager->setDefaultConfiguration(oldConfig);
manager->removeApiLevel(oldConfig);
QCOMPARE(manager->defaultApiLevel(), newerConfig);
QVERIFY(manager->newestApiLevelEnabled());
manager.removeApiLevel(newerConfig);
QCOMPARE(manager.defaultApiLevel(), static_cast<BlackBerryApiLevelConfiguration*>(0));
QVERIFY(manager.newestApiLevelEnabled());
manager->removeApiLevel(newerConfig);
QCOMPARE(manager->defaultApiLevel(), static_cast<BlackBerryApiLevelConfiguration*>(0));
QVERIFY(manager->newestApiLevelEnabled());
}
#endif
Q_EXPORT_PLUGIN2(QNX, QNXPlugin)
Q_EXPORT_PLUGIN2(QNX, QnxPlugin)