Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-26 | 13 | -154/+230 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge remote branch 'origin/master' into berlin-master | Joerg Bornemann | 2010-02-26 | 2 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Get qmake to add pdb files to install target in debug configuration. | Sean Harmer | 2010-02-26 | 2 | -0/+18 | |
| * | | | | | | | | | | | | give symbian an own platform mode | Oswald Buddenhagen | 2010-02-26 | 6 | -91/+19 | |
| * | | | | | | | | | | | | deprecate -win32/-unix/-macx which set both host and target mode | Oswald Buddenhagen | 2010-02-26 | 1 | -3/+3 | |
| * | | | | | | | | | | | | decouple host platform mode from target platform mode | Oswald Buddenhagen | 2010-02-26 | 8 | -16/+110 | |
| * | | | | | | | | | | | | factor out applyHostMode() | Oswald Buddenhagen | 2010-02-26 | 2 | -9/+14 | |
| * | | | | | | | | | | | | make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins | Oswald Buddenhagen | 2010-02-26 | 1 | -9/+13 | |
| * | | | | | | | | | | | | use QDir::separator() instead of Option::dir_sep where appropriate | Oswald Buddenhagen | 2010-02-26 | 3 | -3/+3 | |
| * | | | | | | | | | | | | simplify string ops | Oswald Buddenhagen | 2010-02-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | sanitize evaluation of OS scopes | Oswald Buddenhagen | 2010-02-26 | 1 | -13/+14 | |
| * | | | | | | | | | | | | instead of hard-coding recursion for symbian, add it to the specs | Oswald Buddenhagen | 2010-02-26 | 1 | -4/+0 | |
| * | | | | | | | | | | | | add possibility to request project recursion from within a pro file | Oswald Buddenhagen | 2010-02-26 | 6 | -14/+44 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-26 | 8 | -121/+183 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch '4.6' | Miikka Heikkinen | 2010-02-26 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES | Miikka Heikkinen | 2010-02-26 | 1 | -5/+5 | |
| * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 8 | -116/+178 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Fix SymbianMakefileGenerator::absolutizePath for clean builds | Miikka Heikkinen | 2010-02-25 | 1 | -3/+7 | |
| | * | | | | | | | | | Misc fixes to FLM files | Miikka Heikkinen | 2010-02-25 | 1 | -1/+1 | |
| | * | | | | | | | | | Fix extensions section in bld.inf when CONFIG contains symbian_test | Miikka Heikkinen | 2010-02-24 | 4 | -7/+14 | |
| | * | | | | | | | | | Basic deployment support for ROM in Symbian | Miikka Heikkinen | 2010-02-24 | 7 | -84/+144 | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-22 | 2 | -23/+14 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Changed canonical paths to absolute paths in symmake. | Miikka Heikkinen | 2010-02-22 | 2 | -23/+14 | |
| | * | | | | | | | | | | Fixed shadow builds on Unix. | Rohan McGovern | 2010-02-22 | 1 | -1/+1 | |
| | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 2 | -1/+5 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Fixed shadow builds on Unix. | Rohan McGovern | 2010-02-23 | 1 | -1/+1 | |
* | | | | | | | | | | Fixed linkage failure when building qmake on Unix platforms | Gareth Stockwell | 2010-02-23 | 1 | -2/+0 | |
* | | | | | | | | | | Factored epocRoot implementation out of qmake | Gareth Stockwell | 2010-02-23 | 12 | -151/+40 | |
* | | | | | | | | | | Factored readRegistryKey implementation out of qmake | axis | 2010-02-23 | 7 | -100/+34 | |
* | | | | | | | | | | Revert "Factored readRegistryKey implementation out of qmake" | Thiago Macieira | 2010-02-21 | 7 | -33/+100 | |
* | | | | | | | | | | Revert "Factored epocRoot implementation out of qmake" | Thiago Macieira | 2010-02-21 | 12 | -45/+151 | |
* | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-20 | 14 | -249/+70 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 14 | -248/+69 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Fixed linkage failure when building qmake on Unix platforms | Gareth Stockwell | 2010-02-19 | 1 | -2/+0 | |
| | * | | | | | | | | Factored epocRoot implementation out of qmake | Gareth Stockwell | 2010-02-19 | 12 | -151/+40 | |
| | * | | | | | | | | Factored readRegistryKey implementation out of qmake | Gareth Stockwell | 2010-02-19 | 7 | -100/+34 | |
| | * | | | | | | | | Revert "Factored readRegistryKey implementation out of qmake" | axis | 2010-02-19 | 7 | -34/+100 | |
| | * | | | | | | | | Revert "Factored epocRoot implementation out of qmake" | axis | 2010-02-19 | 12 | -40/+151 | |
| | * | | | | | | | | Factored epocRoot implementation out of qmake | Gareth Stockwell | 2010-02-18 | 12 | -151/+40 | |
| | * | | | | | | | | Factored readRegistryKey implementation out of qmake | Gareth Stockwell | 2010-02-18 | 7 | -100/+34 | |
| * | | | | | | | | | Merge remote branch 'origin/4.6' into integration-master-from-4.6 | Rohan McGovern | 2010-02-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| | * | | | | | | | Use correct (forward slash) separators in qmake-generated bld.inf | Iain | 2010-02-17 | 1 | -1/+1 | |
* | | | | | | | | | Moved the "sis" target and friends from cpp code to qmake profiles. | axis | 2010-02-19 | 5 | -134/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge remote branch 'qt/master' into s60-master | Qt Continuous Integration System | 2010-02-16 | 16 | -1420/+23 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 16 | -1420/+23 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -5/+1 | |
| | * | | | | | | | use variables from the spec instead of hard-coding platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -7/+4 | |
| | * | | | | | | | move $(DEL_FILE) 2> NUL redirection into .conf file | Oswald Buddenhagen | 2010-02-12 | 1 | -14/+2 | |
| | * | | | | | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. | Oswald Buddenhagen | 2010-02-12 | 8 | -1356/+6 | |
| | * | | | | | | | remove weird -tp ce matching line nobody can say anything about | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 | |