Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
96a5245d
Commit
96a5245d
authored
Mar 26, 2013
by
Eike Ziller
Browse files
Merge branch 'master' of
ssh://codereview.qt-project.org/qt-creator/qt-creator
parents
599be01a
92207c96
Changes
163
Hide whitespace changes
Inline
Side-by-side
src/plugins/android/androidconfigurations.h
View file @
96a5245d
...
...
@@ -34,6 +34,7 @@
#include <QString>
#include <QVector>
#include <projectexplorer/abi.h>
#include <utils/fileutils.h>
QT_BEGIN_NAMESPACE
class
QSettings
;
...
...
src/plugins/android/androiddebugsupport.cpp
View file @
96a5245d
...
...
@@ -41,6 +41,7 @@
#include <debugger/debuggerstartparameters.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4project.h>
...
...
src/plugins/android/androiddeployconfiguration.cpp
View file @
96a5245d
...
...
@@ -36,6 +36,7 @@
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <qt4projectmanager/qt4project.h>
#include <qtsupport/qtkitinformation.h>
...
...
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View file @
96a5245d
...
...
@@ -40,12 +40,14 @@
#include "makefileparserthread.h"
#include <projectexplorer/abi.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/headerpath.h>
#include <extensionsystem/pluginmanager.h>
#include <cpptools/ModelManagerInterface.h>
#include <coreplugin/icore.h>
...
...
src/plugins/debugger/debuggerdialogs.cpp
View file @
96a5245d
...
...
@@ -35,6 +35,7 @@
#include "cdb/cdbengine.h"
#include <coreplugin/icore.h>
#include <projectexplorer/toolchain.h>
#include <utils/pathchooser.h>
#include <utils/fancylineedit.h>
#include <utils/qtcassert.h>
...
...
src/plugins/debugger/debuggerkitinformation.cpp
View file @
96a5245d
...
...
@@ -33,6 +33,7 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/toolchainmanager.h>
#include <utils/environment.h>
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
96a5245d
...
...
@@ -82,6 +82,7 @@
#include <projectexplorer/localapplicationrunconfiguration.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/devicesupport/deviceprocesslist.h>
#include <projectexplorer/devicesupport/deviceprocessesdialog.h>
#include <projectexplorer/projectexplorer.h>
...
...
src/plugins/debugger/gdb/startgdbserverdialog.cpp
View file @
96a5245d
...
...
@@ -36,6 +36,7 @@
#include "debuggerstartparameters.h"
#include <projectexplorer/kitchooser.h>
#include <projectexplorer/devicesupport/deviceprocesslist.h>
#include <projectexplorer/devicesupport/deviceprocessesdialog.h>
#include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
#include <ssh/sshremoteprocessrunner.h>
...
...
src/plugins/debugger/logwindow.cpp
View file @
96a5245d
...
...
@@ -50,6 +50,7 @@
#include <utils/savedaction.h>
#include <utils/fancylineedit.h>
#include <utils/fileutils.h>
namespace
Debugger
{
namespace
Internal
{
...
...
src/plugins/genericprojectmanager/genericprojectnodes.cpp
View file @
96a5245d
...
...
@@ -30,6 +30,7 @@
#include "genericprojectnodes.h"
#include "genericproject.h"
#include <utils/fileutils.h>
#include <coreplugin/idocument.h>
#include <projectexplorer/projectexplorer.h>
...
...
src/plugins/madde/maemopublisherfremantlefree.cpp
View file @
96a5245d
...
...
@@ -38,6 +38,7 @@
#include <coreplugin/idocument.h>
#include <projectexplorer/project.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <qt4projectmanager/qmakestep.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qtsupport/baseqtversion.h>
...
...
src/plugins/projectexplorer/abi.cpp
View file @
96a5245d
...
...
@@ -29,7 +29,8 @@
#include "abi.h"
#include <QCoreApplication>
#include <utils/fileutils.h>
#include <QDebug>
#include <QtEndian>
#include <QFile>
...
...
src/plugins/projectexplorer/abi.h
View file @
96a5245d
...
...
@@ -32,10 +32,10 @@
#include "projectexplorer_export.h"
#include <utils/fileutils.h>
#include <QList>
namespace
Utils
{
class
FileName
;
}
namespace
ProjectExplorer
{
// --------------------------------------------------------------------------
...
...
src/plugins/projectexplorer/abstractmsvctoolchain.cpp
View file @
96a5245d
...
...
@@ -33,14 +33,10 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorersettings.h>
#include <projectexplorer/gcctoolchain.h>
#include <utils/fileutils.h>
#include <utils/qtcprocess.h>
#include <utils/synchronousprocess.h>
#include <QFileInfo>
#include <QDir>
#include <QTemporaryFile>
...
...
src/plugins/projectexplorer/abstractmsvctoolchain.h
View file @
96a5245d
...
...
@@ -32,8 +32,10 @@
#include "toolchain.h"
#include "abi.h"
#include "headerpath.h"
#include <utils/environment.h>
#include <utils/fileutils.h>
namespace
ProjectExplorer
{
namespace
Internal
{
...
...
src/plugins/projectexplorer/abstractprocessstep.cpp
View file @
96a5245d
...
...
@@ -29,17 +29,14 @@
#include "abstractprocessstep.h"
#include "ansifilterparser.h"
#include "buildconfiguration.h"
#include "buildstep.h"
#include "ioutputparser.h"
#include "project.h"
#include "target.h"
#include "task.h"
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <QEventLoop>
#include <QTimer>
#include <QDir>
...
...
src/plugins/projectexplorer/allprojectsfilter.cpp
View file @
96a5245d
...
...
@@ -32,8 +32,6 @@
#include "session.h"
#include "project.h"
#include <QVariant>
using
namespace
Core
;
using
namespace
Locator
;
using
namespace
ProjectExplorer
;
...
...
src/plugins/projectexplorer/allprojectsfilter.h
View file @
96a5245d
...
...
@@ -33,7 +33,6 @@
#include <locator/basefilefilter.h>
#include <QFutureInterface>
#include <QString>
namespace
ProjectExplorer
{
...
...
src/plugins/projectexplorer/allprojectsfind.cpp
View file @
96a5245d
...
...
@@ -34,16 +34,13 @@
#include "projectexplorer.h"
#include "editorconfiguration.h"
#include <utils/qtcassert.h>
#include <texteditor/itexteditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QSettings>
#include <QRegExp>
#include <QGridLayout>
#include <QLabel>
#include <QHBoxLayout>
using
namespace
Find
;
using
namespace
ProjectExplorer
;
...
...
src/plugins/projectexplorer/applicationlauncher.cpp
View file @
96a5245d
...
...
@@ -40,14 +40,12 @@
#include <utils/winutils.h>
#endif
#include <QTimer>
#include <QTextCodec>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
#include "projectexplorerconstants.h"
#include "projectexplorer.h"
#include "projectexplorersettings.h"
...
...
Prev
1
2
3
4
5
…
9
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment