summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
| * QmakeParser: Do not leak temporaries into cache of filesTobias Hunger2015-10-271-1/+3
| * ProParser: Plug raw data leakDaniel Teske2015-10-271-1/+1
| * don't complain about missing include()s during cumulative evaluationOswald Buddenhagen2015-10-271-0/+2
| * execute some loops even in cumulative modeOswald Buddenhagen2015-10-271-7/+12
| * QmakeProject: Fix crash on updating sourcesDaniel Teske2015-10-271-1/+24
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-231-0/+2
| |\
| | * Add support for -Zc:throwingNew option to vcxproj generation for 2015Andy Shaw2015-10-231-0/+2
* | | configure: Separate host and build platform.David Schulz2015-10-302-2/+11
* | | QMake: Add option to set qt.conf file.David Schulz2015-10-274-1/+12
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-236-10/+51
|\| |
| * | support relative paths in QMAKE_RPATHDIROswald Buddenhagen2015-10-202-3/+39
| * | msvc2015: Align compiler flags with rest of Qt buildMaurice Kalinowski2015-10-201-1/+1
| * | Move the official Qt version from qglobal.h to .qmake.confThiago Macieira2015-10-142-0/+2
| * | fix bogus complaints about prl targets without extension in bundlesOswald Buddenhagen2015-10-141-1/+2
| * | fix the trailing-backslash-in-DESTDIR-on-mingw workaroundOswald Buddenhagen2015-10-141-5/+7
* | | Compile qmake and configure.exe in C++11 modeThiago Macieira2015-10-181-1/+1
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1420-845/+428
|\| |
| * | QtCore/qmake: drop some unneeded QChar -> QString conversionsMarc Mutz2015-10-111-1/+1
| * | Stop generating implicit suffix rules in MakefilesTor Arne Vestbø2015-10-093-22/+2
| * | Distinguish between Objective-C and Objective-C++ sourcesTor Arne Vestbø2015-10-096-120/+127