summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Add detection of and support for Visual Studio 2015Joerg Bornemann2015-04-092-2/+3
| | | | | | | | Backport of qtbase/ce1c53b4. Task-number: QTBUG-45100 Change-Id: I10db5cfca9976bc37e86b415c2b6e10f51ec5eeb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAkseli Salovaara2015-03-3155-717/+717
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* fix qmake warning about unknown /Zc:strictStrings optionJoerg Bornemann2015-03-201-0/+2
| | | | | | | | | Make /Zc:strictStrings known to qmake's MSVC compiler option parser. Change-Id: I5a4494096fc1d67c96c6de52bb0f1e94eff46136 (cherry picked from commit qtbase/55f88e6e310ceb99bef31ed8d884deaa55c78d91) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* *.sln not generated correctly for VS2012 and VS2010Katja Marttila2015-02-021-4/+4
| | | | | | | | | | msbuild fails to build project since sln not generated correctly Task-number: QTBUG-33446 Change-Id: If92ea743b1b407446873210090aa8591a491abad (cherry picked from qtbase/3515365b9843b12e488880a0685b71f7b3250c33) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Only add the res_file to the generated files if there is no rc_fileAndy Shaw2014-11-271-1/+2
| | | | | | | | | | | If both the rc_file and res_file was added to the project then in MSVC 2012 it would cause an error complaining of a duplicated resource. Task-number: QTBUG-29826 Change-Id: Ib3401b423208cd8c90895038c9cbadd80c39b542 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/fa1fb5ed945650d45cf9b61906232cfbae11360e) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Handle relative paths correctly for files in QMAKE_BUNDLE_DATAAndy Shaw2014-10-271-0/+1
| | | | | | | | | | | | Partially cherry pick from f6bd02317db7beadda1237df7feddd4a780415cb from Qt 5. The Qt 5 SHA1 changes a lot of different parts in the XCode generator after a general qmake change caused some problems. So we just pick the part needed to fix the handling of relative paths used in files in QMAKE_BUNDLE_DATA. Change-Id: I364f82a353dfa922591d07c2aa9061666b79de02 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* qmake vcxproj generator: write PrimaryOutputExtension valueJoerg Bornemann2014-10-274-8/+33
| | | | | | | | | | | | | | | Second attempt. MSVCPROJ_TARGET contains the resolved target name, including version number and target extension. We're splitting this value into PrimaryOutput and PrimaryOutputExtension. PrimaryOutputExtension is only written if it contains a non-default value. Task-number: QTBUG-26782 Change-Id: I4b828dc5dd47322f653585aee1a5767f0cf8bd48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from commit qtbase/d1e950b919615c1ae754e07899f1b45303c17654) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* fix warning when generating VS 2013 projectJoerg Bornemann2014-10-271-0/+5
| | | | | | | | | | | | /FS forces the compiler to synchronize pdb file writes. This option is not needed when building with Visual Studio itself. Still, qmake needs to know it when parsing the compiler flags. Task-number: QTBUG-36535 Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from commit qtbase/9b59e51c5064c67c423389c2c884d009903910c7) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* qmake: Add object_parallel_to_source config optionTor Arne Vestbø2014-08-141-0/+23
| | | | | | | | | | | | | | | | | | | | | This solves the problem of two source files in the same project having the same name, which ends up with colliding object files. It also solves issues with moving files around in the source tree when the GNUmake option is used together with gcc_MD_depends, where the dependency file would end up with a dependency to the old source location. We already have object_with_source option, but that does not play nicely with shadow-builds. The new option tries to keep the same hirarcy in the output dir (while still respecting OBJECTS_DIR), as the sources. Any source with a path outside of the root project directory (absolute or relative, ../../foo.cpp), will be put inside the objects directory with the full path appended. Task-number: QTBUG-34871 (cherry picked from qtbase/47df12225918ba82abe35921af19e547717da58b) Change-Id: I3481b128ed72494a644fdbc55325661a23e868fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* vcxproj generator: append version suffix only to library targetsJoerg Bornemann2014-04-081-1/+3
| | | | | | | Task-number: QTBUG-38066 Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit qtbase/826ab028a8c24b115286d251938396ca1de71b56)
* Updated year in copyright headerKai Koehne2014-03-2655-55/+55
| | | | | | | | | | | | | | | | | | 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-214-3/+18
| | | | | | | | | | | | | | | 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>
* qfilesystemengine_mac.cpp is empty => purgeSamuel Gaist2013-07-052-5/+0
| | | | | | | | | | | All mac related qfilesystemengine operations are done in qfilesystemengine_unix. Purging it like commit bd7ca33889139782f3f0063f93ca9c1f39501a17 in qtbase Change-Id: I16ba494b699d731c3cd688cbd34b81cc67851b47 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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)
* make sure qmake finds itself in CWD on windowsOswald Buddenhagen2013-04-301-0/+1
| | | | | | | | | and consequently that it finds qt.conf. Task-number: QTBUG-30583 Change-Id: I48441477e941d9609270d6e5e1b405127c0c0aca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/e7c3b21b7c1ed9247cb2f9eeddc154534a038549)
* 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)
* Fix generation of XCode projects for XCode 4.6Andy Shaw2013-03-011-3/+5
| | | | | | | | | | | | When a framework is referenced in the XCode project then it is known as a framework by the lastKnownFileType and not the reference type. This ensures it works in both XCode 3 and XCode 4. Task-number: QTBUG-29371 Change-Id: I434246a46d6c5bfd50ba7de1a7c710c0caf0bc0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/4a6a066df2f104763c35eaaaf8dc7b1366d483b2)
* qmake ExtraCompilerTargets: deal with file name which contains spaceDebao Zhang2013-02-111-1/+1
| | | | | | | | Task-number: QTBUG-27629 Change-Id: I6d6c3345cc1bb0a866524df3a1534ed50fc00f3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/b340e40f9185d2f4ec59ce3313447419580fe6ee) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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>
* Fix typo in qmake warningKai Koehne2013-01-281-1/+1
| | | | | | | | Has been fixed in Qt 5 with 0e78e5080262b8f - port qmake to qt creator's qmake language evaluator Change-Id: I598989f7f4e18a37355ee07c83911f8571059614 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1355-55/+55
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Respect the OBJECTS_DIR setting for XCode projectsAndy Shaw2013-01-081-4/+2
| | | | | | | | | Task-number: QTBUG-28104 Change-Id: I0361cb979c40ce14ac163453d8229efc69527b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/eb2d0c82eb8842713f897c0de8c960d07e62df7d)
* Fix handling of precompiled header files in XCode projectsAndy Shaw2013-01-081-9/+4
| | | | | | | Task-number: QTBUG-24589 Change-Id: If81e15aa038f418abea25d96a7b7ec773a87d2db Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/3537ecfecb3dc8bf47261125395a3282455849c6)
* 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)
* accept hex/octal values for RC_LANG and RC_CODEPAGEJoerg Bornemann2012-12-181-1/+7
| | | | | | | | Task-number: QTBUG-28624 Change-Id: I6188045b05ebb8b9d285d1b30f8082a2fe46ff8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b)
* 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: do not exclusively lock files for reading on Windows/MSVCJoerg Bornemann2012-11-281-1/+1
| | | | | | | | | | | | | When sifting through a file to find Q_OBJECT and friends, qmake was locking it for reading and writing (_SH_DENYRW). This breaks parallel builds where multiple qmake instances might want to scan the same file. Changed the sharing constant to _SH_DENYNO, which doesn't lock the file at all. This is consistent with the _sopen_s call in findDeps. Change-Id: I9c0a06db7f580f411e79d9d96dd36a6d705679aa (cherry picked from commit 9cd7eb29f3b216bdac215fb7633b4b51d534d220) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
* Fix XCode generator for qmake when generating for XCode 4.5 and laterAndy Shaw2012-10-182-1/+17
| | | | | | | | | | This is a partial cherry pick from Qt 5 just to include the specific changes needed to get qmake generated XCode projects working with XCode 4.5 or later. Change-Id: I879ca5684435289a61d8db248f2c3f64f6866a60 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/f6bd02317db7beadda1237df7feddd4a780415cb)
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2955-1322/+1322
| | | | | | | | 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>
* Add msvc2012 supportPeter Kümmel2012-09-171-2/+2
| | | | | | | | | | | The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove qurl.cpp from qmake and bootstrap, it's not needed.David Faure2012-08-215-16/+2
| | | | | | | | (and I need this out to be able to use QMutex in QUrl) Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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-0155-110/+110
| | | | | | | | | | | | | - 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>
* Fix qmake hash function to use XORRafael Roquetto2012-07-252-3/+3
| | | | | | | | | | | Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. cherry-picked from qt5/qtbase: 3a27d4b480214072d972ac67561f2ee4010f8baa Change-Id: I582e5b3c42d6436395555a54c6826509d6243ed4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix static library names when generating .pc files for pkgconfigMark Brand2012-04-201-1/+2
| | | | | | | | | | c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension which only occurs on the DLL import library. cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61 Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@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: QMakeProject::intValue addedJoerg Bornemann2012-04-171-0/+13
| | | | | | | | | | For variables that are supposed to contain a single int, this method returns the numeric value. Only the first value of the variable is taken into account. Change-Id: Ifa11ba5ac044e0a4703a387a9bcf02043e4681d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ee4d723ecc24e6be33b4c30f9693b7fdce79c767)
* 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 vcxproj generator: properly escape XML attributesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | Task-number: QTBUG-24954 Change-Id: I21299440ba3f268c2fa1e14d37003cdc3e6a35ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 0174c966f734ba48d387257a14447e8b56d85d37)
* 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>
generated by cgit v0.12 at 2024-11-22 04:53:32 (GMT)