diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-05-17 09:37:56 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-18 08:48:15 +0000 |
commit | a2fe4087ffab6625c81d583d9c2432e63312bcb2 (patch) | |
tree | 35e38511f9f463d94d551231aed2f9b0e9179feb | |
parent | 7252b50922ab05437202a1bd8da5e201447958d6 (diff) | |
download | qt-creator-a2fe4087ffab6625c81d583d9c2432e63312bcb2.tar.gz |
Rename files for QmakeMakeStep
Change-Id: Iff0f3f08fff7a5e25ed309891e54d3c02dbb8713
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.cpp (renamed from src/plugins/qmakeprojectmanager/makestep.cpp) | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.h (renamed from src/plugins/qmakeprojectmanager/makestep.h) | 0 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro | 8 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index f06dc8605e..3f7319bf7f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -32,7 +32,7 @@ #include "qmakeprojectmanagerconstants.h" #include "qmakenodes.h" #include "qmakestep.h" -#include "makestep.h" +#include "qmakemakestep.h" #include "makefileparse.h" #include <coreplugin/documentmanager.h> diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 6af2162934..43498a2c45 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "makestep.h" +#include "qmakemakestep.h" #include "qmakeparser.h" #include "qmakeproject.h" diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h index eee80f0b6e..eee80f0b6e 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.h diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro index c0cc50887b..b831a594d0 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro @@ -31,7 +31,6 @@ HEADERS += \ wizards/subdirsprojectwizarddialog.h \ wizards/simpleprojectwizard.h \ qmakeprojectmanagerconstants.h \ - makestep.h \ qmakestep.h \ qtmodulesinfo.h \ qmakeprojectconfigwidget.h \ @@ -43,7 +42,8 @@ HEADERS += \ qmakeprojectmanager_global.h \ desktopqmakerunconfiguration.h \ profilecompletionassist.h \ - makefileparse.h + makefileparse.h \ + qmakemakestep.h SOURCES += \ qmakekitconfigwidget.cpp \ @@ -70,7 +70,6 @@ SOURCES += \ wizards/subdirsprojectwizard.cpp \ wizards/subdirsprojectwizarddialog.cpp \ wizards/simpleprojectwizard.cpp \ - makestep.cpp \ qmakestep.cpp \ qtmodulesinfo.cpp \ qmakeprojectconfigwidget.cpp \ @@ -81,7 +80,8 @@ SOURCES += \ librarydetailscontroller.cpp \ desktopqmakerunconfiguration.cpp \ profilecompletionassist.cpp \ - makefileparse.cpp + makefileparse.cpp \ + qmakemakestep.cpp FORMS += \ qmakestep.ui \ diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 160fadb258..2b0e99f353 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -30,7 +30,6 @@ Project { "externaleditors.cpp", "externaleditors.h", "librarydetailscontroller.cpp", "librarydetailscontroller.h", "librarydetailswidget.ui", - "makestep.cpp", "makestep.h", "makefileparse.cpp", "makefileparse.h", "profilecompletionassist.cpp", "profilecompletionassist.h", "profileeditor.cpp", "profileeditor.h", @@ -39,6 +38,7 @@ Project { "qmakebuildinfo.h", "qmakekitconfigwidget.cpp", "qmakekitconfigwidget.h", "qmakekitinformation.cpp", "qmakekitinformation.h", + "qmakemakestep.cpp", "qmakemakestep.h", "qmakeparser.cpp", "qmakeparser.h", "qmakeparsernodes.cpp", "qmakeparsernodes.h", "qmakeprojectimporter.cpp", "qmakeprojectimporter.h", diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 703f57011c..1703b5cc74 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -29,7 +29,7 @@ #include "qmakeprojectmanager.h" #include "qmakenodes.h" #include "qmakestep.h" -#include "makestep.h" +#include "qmakemakestep.h" #include "qmakebuildconfiguration.h" #include "desktopqmakerunconfiguration.h" #include "wizards/guiappwizard.h" diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 565880893a..38c477eacf 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -26,7 +26,7 @@ #include "qmakestep.h" #include "ui_qmakestep.h" -#include "makestep.h" +#include "qmakemakestep.h" #include "qmakebuildconfiguration.h" #include "qmakekitinformation.h" #include "qmakenodes.h" |