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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
This commit is contained in:
Eike Ziller
2016-04-12 10:43:10 +02:00
parent 04acb9d643 8dadafb9e0
commit 5c87432260
341 changed files with 2512 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidruncontrol.cpp
View File

@@ -29,8 +29,9 @@
#include "androidrunconfiguration.h"
#include "androidrunner.h"
#include <coreplugin/coreicons.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
using namespace ProjectExplorer;
@@ -43,7 +44,7 @@ AndroidRunControl::AndroidRunControl(AndroidRunConfiguration *rc)
, m_running(false)
{
setRunnable(m_runner->runnable());
setIcon(Icons::RUN_SMALL);
setIcon(Core::Icons::RUN_SMALL);
}
AndroidRunControl::~AndroidRunControl()