diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
| commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
| tree | 8df5223ac114d758c2112a8fc787992175556418 /qmake/generators/win32/msvc_objectmodel.h | |
| parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 850f5f0f57..4b70ca3d71 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -887,6 +887,7 @@ public: QString ConfigurationName; QString OutputDirectory; QString PrimaryOutput; + QString PrimaryOutputExtension; QString ProgramDatabase; QString PlatformToolSet; triState RegisterOutput; |