summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Add TARGET_VERSION_EXT to pkgConfiglibNameHib Eris2012-02-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | The libName that is used in pkgConfig files should include the TARGET_VERSION_EXT. This is needed because in Win32MakefileGenerator::fixTargetExt(), the TARGET_VERSION_EXT is added to the library name. In Win32MakefileGenerator::processVars(), if TARGET_VERSION_EXT is empty, it is set to VER_MAJ. On platforms != Windows, TARGET_VERSION_EXT does not seem to be used. We probably got away with this so far because pkgconfig files generation for win32 was just added in 4.8 and nobody uses them yet, and because on platforms != windows the TARGET_VERSION_EXT is not used. (cherry picked from qtbase commit 219a688ac17052e4bb3aac9ff8a813e3f4d8da01) Change-Id: I56f239e389f0ef926030e4c2376cadd92c4f673c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix qmake evaluation of QMAKE_TARGET.arch on msvc2010 x86_64Giotis Nikos2012-02-091-2/+8
| | | | | | | | | | | | This change is needed because msvc2010 tools have a '\' character at the end of environment variable VCINSTALLDIR. This variable on msvc2008 does not have this '\' character at its end. Without this change QMAKE_TARGET.arch on msvc2010 x64 evaluates to x86 instead of x86_64. cherry picked from qtbase 66f56024ccfc39f818e0f16b44d4916b6a03d322 Task-number: QTBUG-22686 Change-Id: Ibc7546c522506b2c4e7a729a8de319aea788b662 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>
* Add support for XCode 4 into qmakeAndy Shaw2012-02-021-71/+172
| | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Escape path names in qmake-generated Makefiles.Andreas Hartmetz2012-01-311-1/+1
| | | | | | | | | | | | | qmake-generated Makefiles since 4.6 (according to bug report) contain recursive qmake invocations with absolute paths to .pro files, where the absolute paths are not escaped. This is a backport of ea2c9f764fed654a57972223449f41e208e05863 from qtbase master. Task-number: QTBUG-11776 Change-Id: If926fe4f2ee4c0e72e140c0fcc376e5a0fd20f21 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Symbian: qmake: Fix emulator deployment destinationsJaakko Helanti2012-01-172-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | This fix affects how qmake generates "bld.inf" file. Earlier, all emulator deployments went to epoc32/winscw/c, which is the C-drive of the emulator. However, emulator implementation expects often to find deployments from epoc32/release/winscw/udeb/z, which is the ROM drive of the emulator. For this reason many things, including QML deployments, did not work in the emulator. Now the fixed deployment is as follows: - If pro-file deployment has no path value, it goes to emulator ROM drive. - If pro-file deployment has path variable with no drive letter, it goes to emulator ROM drive. - If pro-file deployment has path variable with drive letter, it goes to the given emulator drive. - If pro-file deployment has path variable with '!' as drive letter, it goes to emulator C drive. When making emulator ROM-drive deployment, two deployments are made, one to udeb and one to urel emulator. Task-number: ou1cimx1#954237 Change-Id: I62d3f5b479ee0c0c547e824bb45ae8c0a6484d87 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1155-55/+55
| | | | | | | | | 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
* Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERSMiikka Heikkinen2011-12-091-0/+4
| | | | | | | | | | | The case of the drive letter generated to the absolute paths seems to have changed between 4.7 and 4.8, which led into regression with projects that utilize $$PWD in target name, as that still returns the path with drive letter in same case as previously. Fixed the critical check to be case insensitive in windows. Task-number: ou1cimx1#951456 Reviewed-by: Murray Read
* Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-071-5/+10
| | | | | | | | Some Qt language codes now map to two Symbian language codes. Also added the missing en_in mapping. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Symbian: Only localize the application .rss that needs it, not all .rssMiikka Heikkinen2011-12-072-2/+1
| | | | | | | | | Move LANG statement into proper RESOURCE block inside generated .mmp file, so it doesn't affect _reg.rss, which doesn't need to be localized. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Windows: Add gcc 4.6.Friedemann Kleint2011-11-161-1/+1
| | | | | | | - Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6) - Add detection of g++ version and 64bit to configure. Reviewed-by: mariusSO
* Add INTEGRITY gbuild.* files to qmake project.Rolland Dudemaine2011-11-152-2/+5
| | | | | | | This allows building and debugging qmake from Qt Creator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use the project root from .gpj project files, instead of local path.Rolland Dudemaine2011-11-151-3/+5
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make sure QMAKE_CXX is defined to prevent crashing on some projects.Rolland Dudemaine2011-11-151-1/+3
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add support for .pro-type subdirectories.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add relative path to the work directory, to prevent filename clashes.Rolland Dudemaine2011-11-151-0/+4
| | | | | | | | This was causing issues for some examples, which are all consistently using main.cpp as the entry file. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Only call moc if the file needs it.Rolland Dudemaine2011-11-151-2/+3
| | | | | | | | | This applies to both headers and cpp files (use mocable()). Previously, moc was called on all cpp and h files, causing additional compilation time, and trouble on QSvgGenerator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use outname to specify the output .gpj to generate.Rolland Dudemaine2011-11-151-3/+3
| | | | | | | | | This resolves several path issues as well. outname itself is now based on the first TARGET file, instead of using the output filename. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use "dll" instead of "shared".Rolland Dudemaine2011-11-151-1/+1
| | | | | | | | | | For DLLs (which are not supported, but may be soon), use the CONFIG variable "dll" instead of the "shared" template, because some testcases actually use shared even when compiled statically. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
generated by cgit v0.12 at 2024-11-29 16:53:53 (GMT)