summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-2616-16/+16
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix PlatformToolSet tag location in vcxproj filesJoerg Bornemann2014-02-191-9/+2
| | | | | | | | | | | | | | | The PlatformToolSet tag belongs into the PropertyGroup with the label "Configuration". The former location in an anonymous PropertyGroup tricked Visual Studio into displaying the right PlatformToolSet but using its default value. If VS 2010 and VS 2012 are freshly installed on the same machine, the default toolset for VS 2012 is VS 2010. Task-number: QTBUG-30822 Change-Id: If00a532e92b0812c552b1cac52ff77a1e7039146 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 853a0b764e08d5f910072b6f3fd3ff3f9dc5c0c4)
* add support for Visual Studio 2013Joerg Bornemann2014-01-213-1/+16
| | | | | | | | | | | | | | | Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Task-number: QTBUG-36135 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit f1cdd4b2976706c6d9c3166a75afff6ec5856f3d) Change-Id: I6a6d1ce0de0ba85e1b711976c7340893c58e29ae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qmake/vcxproj: resurrect support for /we compiler switchJoerg Bornemann2013-05-133-1/+8
| | | | | | | | | | | | | The vcxproj format supports the /we compiler switch as TreatSpecificWarningsAsErrors tag. Support for this switch got lost during refactoring of the vc(x)proj generators for Qt 4.8.0. Task-number: QTBUG-29098 Change-Id: I607e907dcb9c1bc7d261053b6d757941ec7db822 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit a3d1d41d1d88b989fe7c460ef32b4f8606aafe0c)
* qmake/vcxproj: fix parsing of /RTC* optionsJoerg Bornemann2013-05-132-14/+30
| | | | | | | | | | /RTCsu and /RTCus must be handled as full runtime check options. Task-number: QTBUG-30711 Change-Id: I783bf49f2ab1d4fd9636dca8e434bccb54844c8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 3c62f4d0c65f1a60bd8d4e6b985d79cb0aa8342b)
* define NDEBUG in MSVC/nmake release buildsJoerg Bornemann2013-03-011-0/+5
| | | | | | | | | | | Some headers, like assert.h, check for the presence of NDEBUG. We already define NDEBUG for MSVC/vcproj release builds. Task-number: QTBUG-3389 Change-Id: I3b1510d47ff80611aa8072e66492ff2d648393eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit ebc4fb452ac268657023cb957c1b0ca0e315b9fc)
* do not parse MSVC option /Gs as /GSJoerg Bornemann2013-02-071-3/+1
| | | | | | | | | | | | /Gs[size] will be added as additional option as there is no XML element for this option. Task-number: QTBUG-29329 Change-Id: I1f09bfdac90f9c5f2333dc03e6e4e6a206b4f6d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 9c1628aae3d3a7a5f935caa10f838ca24832c5f5)
* qmake/MSVC: do not disable buffer security check per defaultJoerg Bornemann2013-02-071-1/+1
| | | | | | | | | | | | The default must be "unset" to let the user's MSVC settings decide what the default value is. Task-number: QTBUG-29329 Change-Id: I6015202c123dbb7304941b0d24557a26a1e3236c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 4fe029963d375675d3d4ddaea7e1767486228a73) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qmake/MSVC: fix parsing of the /openmp optionJoerg Bornemann2013-02-071-3/+12
| | | | | | | | | Task-number: QTBUG-29143 Change-Id: I6b1ce0babf51701fa404b821b22060a87c4f46b2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit be8c47b1404257e33d6b7866101167726a3d1c30) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1316-16/+16
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* fix duplicate TRANSLATION entry in generated RC fileJoerg Bornemann2012-12-211-4/+0
| | | | | | | | Task-number: QTBUG-28625 Change-Id: I9bd6098c7557ca008211acef172f5c51a6766998 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 3e94e8daf36e90e73ca475a81c9b9a3af40b45b3)
* qmake: support for Visual Studio 2012 project files addedJoerg Bornemann2012-12-094-1/+34
| | | | | | | | | | | The differences to VS 2010 project files are the version number (surprise!) and the PlatformToolSet tag which sets the version of the toolchain. Change-Id: If26f08fad1a69d7e6cd28cc5e860ff964f19b264 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 461a01c1df88cdea0e8109948d125fc58a185cf8)
* qmake: fix .pc install target dir separators on windowsJ-P Nurmi2012-10-221-1/+1
| | | | | | | | Task-number: QTBUG-26455 Change-Id: I578345b1676d0d2e812e0ab2e48468b4a8013ee9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 3c05a0f3e7cad3ef4738eb11df4d427c8dbc13e8)
* Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"Joerg Bornemann2012-10-183-12/+2
| | | | | | | | | | | | | | | | This reverts commit 06f0d8a1a9a1d8d46e6f4f3894d76781dfb6638c. The insane logic that prepends the version number of a lib to TARGET_EXT instead of appending it to TARGET breaks every vcxproj with a library version. Fixing this properly will require much more work and testing on all supported Windows platforms. Therefore we're reverting the fix for QTBUG-26782 and mark it as "won't fix" for Qt4. Task-number: QTBUG-26782 Task-number: QTBUG-27554 Change-Id: I0e3d0f0f3976e9ca958574364ec1b2668e1f66f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2916-386/+386
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* qmake vcxproj generator: map TARGET_EXT to $(TargetExt)Joerg Bornemann2012-08-083-2/+12
| | | | | | | | | | Task-number: QTBUG-26782 Cherry-picked from qt5/qtbase commit e81d7fd1e57fe2ce11cbe07636f890973116f7ab Change-Id: I7a93ede18d83d1ecfa74449fc5db76e8b3f6ae99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: un-copy-and-pastify vcxproj generator a bitJoerg Bornemann2012-08-082-60/+70
| | | | | | | | | | Reusing already built strings improves readability and performance. Cherry-picked from qt5/qtbase commit b4ae57c881455d791f4587978423c47b046a9a4e Change-Id: I62554ffb9100af47ffb4978d51444a4cbbea7572 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0116-32/+32
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* qmake vc(x)proj generator: don't create bogus directoriesJoerg Bornemann2012-04-171-0/+3
| | | | | | | | | | When creating the temporary project object, Option::output_dir must be adjusted temporarily. Task-number: QTBUG-22788 Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)
* qmake/Win: fix incomplete generated version resourceJoerg Bornemann2012-04-171-1/+11
| | | | | | | | | | | | | | | Since Windows Vista the resource language must be included to make the version information visible in Windows Explorer. Two new variables have been introduced: RC_LANG (default: 1033) - resource language RC_CODEPAGE (default: 1200) - resource codepage Task-number: QTBUG-23218 Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 8987e5d2cb7b7816fd0002fd9ad939ab4f08971b)
* qmake vcxproj generator: fix handling of /MANIFEST:NO linker optionJoerg Bornemann2012-04-171-0/+7
| | | | | | | | | Task-number: QTBUG-23513 Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)
* qmake vcproj generator: unused variable removedJoerg Bornemann2012-04-171-1/+0
| | | | | | Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)
* qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-161-1/+3
| | | | | | | | | | | | | If VC++ 2010 Express and VC# 2010 Express are installed, then the installation path is written in two places into the registry. We're now filtering detected installations with the same installation path. Task-number: QTBUG-24956 Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-03-221-0/+4
| | | | | | | | | | | | | | For the debug configuration the optimization should be turned off. This is the completion of the backport of ece75a8adfc30c91f25d45d37f98bf8cda90fdce. Task-number: QTBUG-23421 Change-Id: Ibf30d1e27b3b614bd4b1304d21be76af3faf0249 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* escape *_script_file usages in MingwMakefileGenerator::writeObjectsPartMax Desyatov2012-03-071-4/+4
| | | | | | | (cherry picked from qtbase commit 9d5e721e96f19812a766a4c7d3f8b41f455f507c) Task-number: QTBUG-24595 Change-Id: I761e4ffb0e473c35784cf1ba5289a79dae5a012b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Create target pkgconfig dir in qmake generated Windows MakefilesHib Eris2012-02-291-0/+6
| | | | | | | (cherry picked from qtbase commit cbf8f03cf4f3b0aa49c9f35c9ae0e3304f142ac7) Change-Id: Icea70987ee3c6040ca3ba278a578849cb74156f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement missing replacements when installing .pc files for win32Hib Eris2012-02-291-1/+17
| | | | | | | | | | | | | | | | | | | | This implements replacements for win32 makefile generators similar to the replacement functionality in unix makefile generators. To enable Makefile code generation for replacements in win32 makefile generators, you must set QMAKE_STREAM_EDITOR to e.g. sed. When building for win32, sed is normally only available in the mingw/msys build environment and when cross compiling on unix. In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf. For other win32 build environments QMAKE_STREAM_EDITOR is not set in qmake.conf and the replacements Makefile code is not generated. (cherry picked from qtbase commit 78faefdbb1ccc296c967dde40e2a7a1c78e4cec2) Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2012-02-071-0/+2
| | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1116-16/+16
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-01-061-0/+4
| | | | | | | | | For the debug configuration the optimization should be turned off. Reviewed-by: ossi Task-number: QTBUG-23421 Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
* qmake: fix /MP option for VS 2010Joerg Bornemann2012-01-061-3/+3
| | | | | | | | | Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010. Task-number: QTBUG-23490 Reviewed-by: ossi Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
* qmake: fix writing of incremental linker option for vcxproj filesJoerg Bornemann2011-10-141-1/+1
|
* qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | Task-number: QTBUG-20419 Reviewed-by: ossi
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1316-274/+274
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-05-116-37/+25
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e qmake vc(x)proj generator: support x64 Qt builds qmake: remove dead code from VcxprojGenerator qmake nmake generator: pass MAKEFLAGS to sub-make calls
| * qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| | | | | | | | | | Task-number: QTBUG-17911 Reviewed-by: ossi
| * qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| | | | | | | | Reviewed-by: ossi
| * qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-052-0/+11
| | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
* | qmake: Introduce new template typeChristian Kandeler2011-05-033-3/+21
| | | | | | | | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-23/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * | make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | | | | | | | | | | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
| * | run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | | | | | | | | | | | | | | | | | followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 Reviewed-by: mariusSO
| * | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-143-26/+98
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * | Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We needed to move the code in the init() function to the fixTargetExt() function, which is where the variables are actually used. The reason is that fixTargetExt() runs before init(). RevBy: Miikka Heikkinen
| | * | Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because trailing \ would confuse the command line parser if the path was also quoted. RevBy: Oswald Buddenhagen
| | * | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-043-9/+19
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables you to use QMAKE_xxx_yyy, where xxx is either CFLAGS, CXXFLAGS or LFLAGS, and yyy is either APP, SHLIB or PLUGIN. It is basically the same as the one in the UNIX generator. RevBy: Oswald Buddenhagen
| | * | Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a mirror of the way the UNIX generator does it. See commits aaf189b084f52 and bdff51768dfe. RevBy: Oswald Buddenhagen
generated by cgit v0.12 at 2025-03-21 04:04:24 (GMT)