diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-12 16:49:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-12 16:49:57 +0100 |
| commit | 6433af534dee3ade44511ec3190425c03fb25ec5 (patch) | |
| tree | e81017fb81f591aa1b4ef5f65296c4c0763a5b22 /src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs | |
| parent | 23ec56516e02796fe22c5c84d59a309d90234908 (diff) | |
| parent | d108a54aabe1043afe3d2700ffa0b5afb3869292 (diff) | |
| download | qt-creator-6433af534dee3ade44511ec3190425c03fb25ec5.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
qtcreator.pri
Change-Id: Iacd9f2afb843f06d457914a3b842dfc606e3adf3
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 13a7c4d607..24e1d9f158 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -28,6 +28,7 @@ QtcPlugin { "librarydetailscontroller.cpp", "librarydetailscontroller.h", "librarydetailswidget.ui", "makestep.cpp", "makestep.h", "makestep.ui", + "makefileparse.cpp", "makefileparse.h", "profilecompletionassist.cpp", "profilecompletionassist.h", "profileeditor.cpp", "profileeditor.h", "profilehighlighter.cpp", "profilehighlighter.h", |