diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:47 +0200 |
| commit | 8ed2fcd366caf310e99db982f222bc6ec750c0a7 (patch) | |
| tree | c51cae57da4a87d677145e44ba57765a1e5a3874 /qmake | |
| parent | 6918c0a15ba049d7e0de2302846dfadce4866861 (diff) | |
| parent | c12b5e07274acde364be98cd0de620d3a44c97b7 (diff) | |
Merge 5.5 into 5.5.1
Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 3 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index a2afeaf765..ccb8d95973 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -728,8 +728,7 @@ \section2 Creating and Moving Xcode Projects Developers on OS X can take advantage of the qmake support for Xcode - project files, as described in - \l{Qt is OS X Native#Development Tools}{Qt is OS X Native}, + project files, as described in \l{Additional Command-Line Options}, by running qmake to generate an Xcode project from an existing qmake project file. For example: diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 8e08ab248e..9acfa6588b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -655,6 +655,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) switch (which_dotnet_version(project->first("MSVC_VER").toLatin1())) { case NET2015: t << _slnHeader140; + break; case NET2013: t << _slnHeader120; break; |