summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* MakefileGenerator: use erase and std::remove_if with QVectorAnton Kudryavtsev2016-01-121-6/+8
* Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2016-01-0811-29/+56
|\
| * rewrite qtAddToolEnv()Oswald Buddenhagen2016-01-081-4/+0
| * winphone: Invoke windeployqt twice unconditionally for vcprojMaurice Kalinowski2016-01-051-2/+2
| * Correctly flag WinPhoneFrank Meerkoetter2016-01-011-1/+1
| * add enablers for printing project errors in cumulative modeOswald Buddenhagen2015-12-215-7/+15
| * make CONFIG feature evaluation failure non-fatal in cumulative modeOswald Buddenhagen2015-12-211-1/+1
| * Add missing includes.Friedemann Kleint2015-12-211-1/+2
| * make write_file() capable of making files (not) executableOswald Buddenhagen2015-12-214-13/+35
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-184-167/+316
|\ \ | |/
| * qmake: Combine two variables into an array to simplify a loop.Edward Welbourne2015-12-171-7/+5
| * qmake: teach findMocs to handle backslash-newline gracefully.Edward Welbourne2015-12-171-36/+47
| * qmake: simplify file-reading loop in findMocsEdward Welbourne2015-12-151-4/+4
| * qmake: teach moc-detector to handle C++-11 raw stringsEdward Welbourne2015-12-151-81/+85
| * qmake: Fix comment false-alarm bug in findMocs().Edward Welbourne2015-12-151-0/+2
| * Rewrote qmake's #include-detection to be more faithful to CPP.Edward Welbourne2015-12-151-102/+236
| * Don't ignore first character after a string.Edward Welbourne2015-12-111-7/+4
| * Doc: do not claim that SUBDIRS.depends is only available for MakefilesJoerg Bornemann2015-12-091-1/+0
| * Teach qmake's #include parser to recognize C++11 Raw strings.Edward Welbourne2015-12-081-9/+38
| * Remove Wow6432Node versions of Visual Studio registry keysJoerg Bornemann2015-12-082-33/+8
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2015-12-081-6/+4
|\ \ | |/
| * Remove superfluous code from collectDependenciesJoerg Bornemann2015-12-041-5/+3
| * vcproj generator: Fix auto-generated inter-project dependenciesJoerg Bornemann2015-12-041-1/+1
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-021-21/+3
|\ \ | |/
| * qmake: Correctly handle shadow build of nested vcsubdirs projects.Mathew Sutcliffe2015-12-011-21/+3
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2015-11-271-7/+4
|\ \ | |/
| * Simplify a search for terminator.Edward Welbourne2015-11-241-7/+4
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-231-132/+120
|\ \ | |/
| * Comment to point out problem with CRLF handling.Edward Welbourne2015-11-201-0/+1
| * Simplify a loop's set-up and control.Edward Welbourne2015-11-201-2/+2
| * Rework scan for keyword in preprocessor directive.Edward Welbourne2015-11-201-15/+11
| * Skip spaces (after #) earlier to catch blank line or end-of-buffer.Edward Welbourne2015-11-201-8/+12
| * Avoid having division caught up in parsing of comments.Edward Welbourne2015-11-201-14/+13
| * Readability clean-up (purely cosmetic).Edward Welbourne2015-11-201-93/+97
| * Rip out the #qmake_warning "preprocessor directive".Edward Welbourne2015-11-201-17/+1
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-183-4/+10
|\ \ | |/
| * MakefileGenerator::processSources() doesn't need to be virtual.Edward Welbourne2015-11-132-2/+1
| * Xcode generator: only replace the suffix in the library pathRichard Moe Gustavsen2015-11-091-2/+9
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-0410-65/+103
|\ \ | |/
| * Doc: corrected error about path list separatorNico Vertriest2015-11-041-10/+12
| * fix vcxproj linker optionsJoerg Bornemann2015-10-271-6/+7
| * Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2015-10-271-1/+1
| * QMakeGlobals::expandEnvVars: Make saneDaniel Teske2015-10-271-24/+18
| * Remove Qt version checks.Christian Kandeler2015-10-271-4/+0
| * Use Qt 5's QStringList::join(QChar)hjk2015-10-271-4/+4
| * consider qt resource paths absoluteOswald Buddenhagen2015-10-271-0/+4
| * avoid that a bad qmakespec path crashes the evaluatorOswald Buddenhagen2015-10-271-4/+10
| * add ProFile::tokPtrEnd()Daniel Teske2015-10-271-0/+1
| * fix raw data leak in $$sprintf()Oswald Buddenhagen2015-10-271-1/+1
| * micro-optimization: use ProStringList::join(QChar) overloadOswald Buddenhagen2015-10-271-1/+1