summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-272-9/+14
|\
| * Doc: update description of qmake SUBDIRS variableLeena Miettinen2013-08-262-9/+14
* | avoid deadlock in cache() during spec/cache loadingOswald Buddenhagen2013-08-271-1/+1
* | lock baseEnv in cache()Oswald Buddenhagen2013-08-272-34/+58
* | always check for baseEnv init failureOswald Buddenhagen2013-08-271-0/+2
* | remove support for Qtopia's QOM_OBJECT macroJoerg Bornemann2013-08-261-8/+3
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-218-8/+143
|\ \ | |/
| * Doc: public test functions in function librariesLeena Miettinen2013-08-152-0/+135
| * Don't compile MD4, MD5, SHA-2 and SHA-3 into qmakeThiago Macieira2013-08-156-8/+8
* | change reporting of missing filesOswald Buddenhagen2013-08-201-3/+4
* | complain about absent files to -pro argument (in lupdate)Oswald Buddenhagen2013-08-202-6/+7
* | avoid boolean argument trap: introduce QMakeParser::ParseFlagOswald Buddenhagen2013-08-203-4/+12
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-143-1/+55
|\ \ | |/
| * Fix SONAME handling on androidStephen Kelly2013-08-131-0/+3
| * Doc: fix links to documentation in other modulesLeena Miettinen2013-08-081-0/+49
| * Doc: Add keywords for qmake variable/function reference pagesTopi Reinio2013-07-301-0/+3
* | Doc: Fixed qmake manual's images and snippets directories.Jerome Pasion2013-08-1335-184/+183
* | Doc: add winextras to the list of QT variable valuesLeena Miettinen2013-08-082-0/+4
* | implement simple VFS to support caching during project parsingOswald Buddenhagen2013-08-0714-73/+321
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-237-59/+121
|\ \ | |/
| * don't install mac bundles atomicallyOswald Buddenhagen2013-07-222-26/+59
| * mac frameworks: link target alias to Current versionOswald Buddenhagen2013-07-221-3/+2
| * fix target strip-ing inside mac bundlesOswald Buddenhagen2013-07-221-8/+13
| * make unescapeFilePath() less inefficientOswald Buddenhagen2013-07-221-6/+2
| * escape paths coming from prl filesOswald Buddenhagen2013-07-222-3/+9
| * unbreak use of not-overquoted ICON entriesOswald Buddenhagen2013-07-221-3/+2
| * fix c-quoting of strings which contain quotesOswald Buddenhagen2013-07-221-1/+1
| * resolve output of .depend_command relative to $$OUT_PWDOswald Buddenhagen2013-07-221-4/+28
| * Changed digia contact details to */legal, updated licensesTeemu Kaukoranta2013-07-202-2/+2
| * un-clash iterator namesOswald Buddenhagen2013-07-151-8/+8
| * undo accidental string mergeOswald Buddenhagen2013-07-151-1/+1
* | update m_featureRoots less aggressivelyOswald Buddenhagen2013-07-191-1/+2
* | cache results of feature searchOswald Buddenhagen2013-07-192-24/+62
* | minor optimization: don't concatenate strings needlesslyOswald Buddenhagen2013-07-193-1/+8
* | don't unnecessarily use QFileInfo::filePath()Oswald Buddenhagen2013-07-191-3/+3
* | Merge branch 'stable' into devSergio Ahumada2013-07-1115-553/+579
|\ \ | |/
| * MANIFEST:NO is not written to vcprojKatja2013-07-051-0/+2
| * merge string literalsOswald Buddenhagen2013-07-047-540/+540
| * VPATH resolution: don't crash when $(FOO) expands to nothingOswald Buddenhagen2013-07-041-0/+4
| * don't crash if builddir is suffix of sourcedir (or vice-versa)Oswald Buddenhagen2013-07-041-1/+2
| * add support for Visual Studio 2013Joerg Bornemann2013-07-044-3/+18
| * make split_value_list() even less sane againOswald Buddenhagen2013-07-031-5/+8
| * Only add the res_file to the generated files if there is no rc_fileAndy Shaw2013-07-021-1/+2
| * qmake: Change two scopes to mac instead of macxTor Arne Vestbø2013-07-021-2/+2
* | Xcode: Fix defines in OTHER_C/CPLUSPLUSFLAGS for project file outputTor Arne Vestbø2013-07-032-5/+11
* | Xcode: Fix string quoting to match ASCII plist formatTor Arne Vestbø2013-07-031-20/+60
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-277-5/+63
|\ \ | |/
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/s...Frederik Gladhorn2013-06-252-3/+4
| |\
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-3/+4
| | |\
| | | * make Makefiles not depend on .qmake.superOswald Buddenhagen2013-06-152-3/+4