summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Collapse)AuthorAgeFilesLines
* do not make PWD and OUT_PWD have trailing slashes upon returning from a ↵Oswald Buddenhagen2009-06-111-6/+5
| | | | | | | | SUBDIRS target they don't have initially, either. Reviewed-by: mariusSO
* do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
| | | | | | | | the top-level one doesn't have one, either, so this lead to inconsistent behavior depending on whether the pro was processed directly or from a SUBDIRS target. Reviewed-by: mariusSO
* remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| | | | Reviewed-by: mariusSO
* Remove the fixFilename() usage from the solution generatorMarius Storm-Olsen2009-05-291-1/+1
| | | | | | | | | | Only the Solution Generator was using the fixFilename() function, so under some circumstances the solution filename wouldn't find the correct vcproj file to include. This created a problem with network-chat.vcproj. Task-number: 254772 Reviewed-by: joao
* Fixed qmake writing targets into the root of the current drive whenRohan McGovern2009-05-261-1/+1
| | | | | | | | | | | | | | | | DESTDIR=./ and using Windows, nmake and shadow builds. qmake would canonicalize the DESTDIR of "./" to "". Then it would check if the original DESTDIR ended with "/", and if so, append it to the new DESTDIR, resulting in a DESTDIR of "/" - the root of the current drive. Don't do that. This bug doesn't occur with in-source builds because qmake detects that the source and build directories are the same directory and replaces the DESTDIR of "./" with "" before it reaches the buggy code. Autotest: included Reviewed-by: Lincoln Ramsay
* Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-141-1/+1
| | | | | | foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
* Missing debug .rc file with a clean shadow buildLincoln Ramsay2009-04-211-3/+15
| | | | | | | | | | | | When generating Windows Makefiles, qmake writes out a .rc file for each of debug and release (unless you've limited to just one build type). When doing a clean shadow build, the first .rc file is written into a directory that does not exist but the code was not handling the error case. The fix does 2 things. 1) Attempt to create the destination directory if we can't write the file. 2) Die with an error if we still can't write the file after doing #1. Reviewed-by: Marius Storm-Olsen
* qmake: additional compiler options were written twice into vcproj filesJoerg Bornemann2009-04-071-2/+0
| | | | | | | | In the function initCompilerTool we handled QMAKE_CXXFLAGS twice for every configuration (debug / release). The call of parseOptions before the if clause is enough. Reviewed-by: mariusSO
* fix QMAKE_VAR_FIRST_ expansion in compiler flagsOswald Buddenhagen2009-04-071-1/+1
| | | | | doesn't seem to be a terribly popular feature, given that nobody noticed this yet ...
* Small changes in qmake's fileFixifyJoão Abecasis2009-04-021-9/+3
| | | | | | | Removed dead code and simplified conditionals. This should not otherwise change behavior or output of qmake in any way. Reviewed-by: mariusSO
* Spring cleaning in qmake testsJoão Abecasis2009-04-022-4/+4
| | | | | | | | | | And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
* cosmetic bug in qmake msvc_nmake generator fixedJoerg Bornemann2009-04-021-3/+3
| | | | | | | When generating nmake makefiles, the same inference rules were generated several times. Reviewed-by: mariusSO
* even more verbose debug outputOswald Buddenhagen2009-03-271-1/+1
|
* Long live Qt 4.5!Lars Knoll2009-03-2329-0/+19548