summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2613-154/+230
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-262-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Get qmake to add pdb files to install target in debug configuration.Sean Harmer2010-02-262-0/+18
| * | | | | | | | | | | | give symbian an own platform modeOswald Buddenhagen2010-02-266-91/+19
| * | | | | | | | | | | | deprecate -win32/-unix/-macx which set both host and target modeOswald Buddenhagen2010-02-261-3/+3
| * | | | | | | | | | | | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-268-16/+110
| * | | | | | | | | | | | factor out applyHostMode()Oswald Buddenhagen2010-02-262-9/+14
| * | | | | | | | | | | | make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtinsOswald Buddenhagen2010-02-261-9/+13
| * | | | | | | | | | | | use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-263-3/+3
| * | | | | | | | | | | | simplify string opsOswald Buddenhagen2010-02-261-1/+1
| * | | | | | | | | | | | sanitize evaluation of OS scopesOswald Buddenhagen2010-02-261-13/+14
| * | | | | | | | | | | | instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-261-4/+0
| * | | | | | | | | | | | add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-266-14/+44
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-268-121/+183
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.6'Miikka Heikkinen2010-02-261-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULESMiikka Heikkinen2010-02-261-5/+5
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-268-116/+178
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix SymbianMakefileGenerator::absolutizePath for clean buildsMiikka Heikkinen2010-02-251-3/+7
| | * | | | | | | | | Misc fixes to FLM filesMiikka Heikkinen2010-02-251-1/+1
| | * | | | | | | | | Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-244-7/+14
| | * | | | | | | | | Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-247-84/+144
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-222-23/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-222-23/+14
| | * | | | | | | | | | Fixed shadow builds on Unix.Rohan McGovern2010-02-221-1/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-242-1/+5
|/ / / / / / / / / /
* | | | | | | | | | Fixed shadow builds on Unix.Rohan McGovern2010-02-231-1/+1
* | | | | | | | | | Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-231-2/+0
* | | | | | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-2312-151/+40
* | | | | | | | | | Factored readRegistryKey implementation out of qmakeaxis2010-02-237-100/+34
* | | | | | | | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-217-33/+100
* | | | | | | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2112-45/+151
* | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-2014-249/+70
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2014-248/+69
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-191-2/+0
| | * | | | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1912-151/+40
| | * | | | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-197-100/+34
| | * | | | | | | | Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-197-34/+100
| | * | | | | | | | Revert "Factored epocRoot implementation out of qmake"axis2010-02-1912-40/+151
| | * | | | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1812-151/+40
| | * | | | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-187-100/+34
| * | | | | | | | | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
* | | | | | | | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-195-134/+0
|/ / / / / / / /
* | | | | | | | Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1616-1420/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1316-1420/+23
| |\ \ \ \ \ \ \
| | * | | | | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-5/+1
| | * | | | | | | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * | | | | | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
| | * | | | | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-128-1356/+6
| | * | | | | | | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1