aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/msbuild
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/msbuild')
-rw-r--r--src/lib/msbuild/io/visualstudiosolutionwriter.cpp14
-rw-r--r--src/lib/msbuild/msbuild.pro58
-rw-r--r--src/lib/msbuild/solution/visualstudiosolution.cpp4
-rw-r--r--src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp2
-rw-r--r--src/lib/msbuild/use_installed_msbuild.pri20
-rw-r--r--src/lib/msbuild/use_msbuild.pri38
6 files changed, 3 insertions, 133 deletions
diff --git a/src/lib/msbuild/io/visualstudiosolutionwriter.cpp b/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
index 625489ac6..874fbc71f 100644
--- a/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
+++ b/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
@@ -108,20 +108,6 @@ bool VisualStudioSolutionWriter::write(const VisualStudioSolution *solution)
<< project->guid().toString().toStdString()
<< u8"\"\n";
- const auto dependencies = solution->dependencies(project);
- if (!dependencies.empty()) {
- out << u8"\tProjectSection(ProjectDependencies) = postProject\n";
-
- for (const auto &dependency : dependencies)
- out << u8"\t\t"
- << dependency->guid().toString().toStdString()
- << u8" = "
- << dependency->guid().toString().toStdString()
- << u8"\n";
-
- out << u8"\tEndProjectSection\n";
- }
-
out << u8"EndProject\n";
}
diff --git a/src/lib/msbuild/msbuild.pro b/src/lib/msbuild/msbuild.pro
deleted file mode 100644
index f724df793..000000000
--- a/src/lib/msbuild/msbuild.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TARGET = qbsmsbuild
-include(../staticlibrary.pri)
-include(../corelib/use_corelib.pri)
-
-HEADERS += \
- io/msbuildprojectwriter.h \
- io/visualstudiosolutionwriter.h \
- msbuild/imsbuildgroup.h \
- msbuild/imsbuildnode.h \
- msbuild/imsbuildnodevisitor.h \
- msbuild/items/msbuildclcompile.h \
- msbuild/items/msbuildclinclude.h \
- msbuild/items/msbuildfileitem.h \
- msbuild/items/msbuildfilter.h \
- msbuild/items/msbuildlink.h \
- msbuild/items/msbuildnone.h \
- msbuild/msbuildimport.h \
- msbuild/msbuildimportgroup.h \
- msbuild/msbuilditem.h \
- msbuild/msbuilditemdefinitiongroup.h \
- msbuild/msbuilditemgroup.h \
- msbuild/msbuilditemmetadata.h \
- msbuild/msbuildproject.h \
- msbuild/msbuildproperty.h \
- msbuild/msbuildpropertybase.h \
- msbuild/msbuildpropertygroup.h \
- solution/ivisualstudiosolutionproject.h \
- solution/visualstudiosolution.h \
- solution/visualstudiosolutionfileproject.h \
- solution/visualstudiosolutionfolderproject.h \
- solution/visualstudiosolutionglobalsection.h
-
-SOURCES += \
- io/msbuildprojectwriter.cpp \
- io/visualstudiosolutionwriter.cpp \
- msbuild/imsbuildgroup.cpp \
- msbuild/imsbuildnode.cpp \
- msbuild/items/msbuildclcompile.cpp \
- msbuild/items/msbuildclinclude.cpp \
- msbuild/items/msbuildfileitem.cpp \
- msbuild/items/msbuildfilter.cpp \
- msbuild/items/msbuildlink.cpp \
- msbuild/items/msbuildnone.cpp \
- msbuild/msbuildimport.cpp \
- msbuild/msbuildimportgroup.cpp \
- msbuild/msbuilditem.cpp \
- msbuild/msbuilditemdefinitiongroup.cpp \
- msbuild/msbuilditemgroup.cpp \
- msbuild/msbuilditemmetadata.cpp \
- msbuild/msbuildproject.cpp \
- msbuild/msbuildproperty.cpp \
- msbuild/msbuildpropertybase.cpp \
- msbuild/msbuildpropertygroup.cpp \
- solution/ivisualstudiosolutionproject.cpp \
- solution/visualstudiosolution.cpp \
- solution/visualstudiosolutionfileproject.cpp \
- solution/visualstudiosolutionfolderproject.cpp \
- solution/visualstudiosolutionglobalsection.cpp
diff --git a/src/lib/msbuild/solution/visualstudiosolution.cpp b/src/lib/msbuild/solution/visualstudiosolution.cpp
index 89b266647..0f6cd4f23 100644
--- a/src/lib/msbuild/solution/visualstudiosolution.cpp
+++ b/src/lib/msbuild/solution/visualstudiosolution.cpp
@@ -72,7 +72,7 @@ QList<IVisualStudioSolutionProject *> VisualStudioSolution::projects() const
QList<VisualStudioSolutionFileProject *> VisualStudioSolution::fileProjects() const
{
QList<VisualStudioSolutionFileProject *> list;
- for (const auto &project : qAsConst(d->projects))
+ for (const auto &project : std::as_const(d->projects))
if (auto fileProject = qobject_cast<VisualStudioSolutionFileProject *>(project))
list.push_back(fileProject);
return list;
@@ -81,7 +81,7 @@ QList<VisualStudioSolutionFileProject *> VisualStudioSolution::fileProjects() co
QList<VisualStudioSolutionFolderProject *> VisualStudioSolution::folderProjects() const
{
QList<VisualStudioSolutionFolderProject *> list;
- for (const auto &project : qAsConst(d->projects))
+ for (const auto &project : std::as_const(d->projects))
if (auto folderProject = qobject_cast<VisualStudioSolutionFolderProject *>(project))
list.push_back(folderProject);
return list;
diff --git a/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp b/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
index 7a67ce22b..e1b83d801 100644
--- a/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
+++ b/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
@@ -52,7 +52,7 @@ VisualStudioSolutionFileProject::~VisualStudioSolutionFileProject() = default;
QString VisualStudioSolutionFileProject::name() const
{
- const auto projectName = IVisualStudioSolutionProject::name();
+ auto projectName = IVisualStudioSolutionProject::name();
if (projectName.isEmpty())
return QFileInfo(filePath()).baseName();
return projectName;
diff --git a/src/lib/msbuild/use_installed_msbuild.pri b/src/lib/msbuild/use_installed_msbuild.pri
deleted file mode 100644
index af89b2550..000000000
--- a/src/lib/msbuild/use_installed_msbuild.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-include(use_installed_corelib.pri)
-
-LIBNAME=qbsmsbuild
-
-unix:LIBS += -l$${LIBNAME}
-
-win32 {
- CONFIG(debug, debug|release) {
- QBSMSBUILDLIB = $${LIBNAME}d$${QBSCORELIBSUFFIX}
- }
- CONFIG(release, debug|release) {
- QBSMSBUILDLIB = $${LIBNAME}$${QBSCORELIBSUFFIX}
- }
- msvc {
- QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib
- } else {
- QBSMSBUILDLIB = lib$${QBSMSBUILDLIB}
- }
- LIBS += $${QBSMSBUILDLIB}
-}
diff --git a/src/lib/msbuild/use_msbuild.pri b/src/lib/msbuild/use_msbuild.pri
deleted file mode 100644
index bb69968d5..000000000
--- a/src/lib/msbuild/use_msbuild.pri
+++ /dev/null
@@ -1,38 +0,0 @@
-include(../../library_dirname.pri)
-
-isEmpty(QBSLIBDIR) {
- QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME}
-}
-
-LIBNAME=qbsmsbuild
-
-unix {
- LIBS += -L$${QBSLIBDIR} -l$${LIBNAME}
-}
-
-win32 {
- CONFIG(debug, debug|release) {
- QBSMSBUILDLIB = $${LIBNAME}d
- }
- CONFIG(release, debug|release) {
- QBSMSBUILDLIB = $${LIBNAME}
- }
- msvc {
- LIBS += /LIBPATH:$$QBSLIBDIR
- QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib
- LIBS += Shell32.lib
- } else {
- LIBS += -L$${QBSLIBDIR}
- QBSMSBUILDLIB = lib$${QBSMSBUILDLIB}
- }
- LIBS += $${QBSMSBUILDLIB}
-}
-
-INCLUDEPATH += \
- $$PWD
-
-CONFIG += depend_includepath
-
-CONFIG(static, static|shared) {
- DEFINES += QBS_STATIC_LIB
-}