Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | buildfix for qmake | Ritt Konstantin | 2011-06-21 | 1 | -1/+1 | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-21 | 2 | -0/+6 | |
|\ \ \ | ||||||
| * | | | Export IPHONEOS_DEPLOYMENT_TARGET from qmake | Ian | 2011-06-20 | 2 | -0/+6 | |
| |/ / | ||||||
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 55 | -999/+1046 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-05-20 | 2 | -4/+42 | |
| |\ \ | ||||||
| | * | | Improve DEFINES crossplatform compatibility in Symbian builds. | Miikka Heikkinen | 2011-05-16 | 2 | -4/+42 | |
| * | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 1 | -5/+2 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-17 | 1 | -1/+1 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 8 | -51/+41 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | * | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-06 | 1 | -1/+1 | |
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||||
| | | | * | | don't ignore create_prl for static plugins | Oswald Buddenhagen | 2011-05-06 | 1 | -1/+1 | |
| | * | | | | Merge remote branch 'origin/4.8' into qa-review-master | Rohan McGovern | 2011-05-15 | 28 | -209/+249 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | * | | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile | Rohan McGovern | 2011-05-12 | 1 | -4/+1 | |
| * | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 55 | -937/+937 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-05-11 | 8 | -51/+41 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e | Joerg Bornemann | 2011-05-11 | 1 | -2/+2 | |
| | * | | | qmake vc(x)proj generator: support x64 Qt builds | Joerg Bornemann | 2011-05-06 | 2 | -9/+14 | |
| | * | | | qmake: remove dead code from VcxprojGenerator | Joerg Bornemann | 2011-05-06 | 2 | -28/+0 | |
| | * | | | qmake nmake generator: pass MAKEFLAGS to sub-make calls | Joerg Bornemann | 2011-05-05 | 4 | -14/+27 | |
| * | | | | qmake: Introduce new template type | Christian Kandeler | 2011-05-03 | 4 | -4/+26 | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-03 | 7 | -57/+84 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Fix wrong merge of 3aa39b0164ce4bb9e | Olivier Goffart | 2011-04-19 | 1 | -1/+1 | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 7 | -56/+83 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | look for makespec in the build dir first | Oswald Buddenhagen | 2011-04-12 | 1 | -3/+3 | |
| | * | | | make collection of SUBDIRS in solution generator less bizarre | Oswald Buddenhagen | 2011-04-12 | 2 | -21/+22 | |
| | * | | | run depend_command in build dir in VS generators as well | Oswald Buddenhagen | 2011-04-12 | 4 | -4/+18 | |
| | * | | | fixify target source against build tree | Oswald Buddenhagen | 2011-04-12 | 1 | -1/+1 | |
| | * | | | fix fixifying of QMAKE_SUBSTITUTES | Oswald Buddenhagen | 2011-04-12 | 1 | -6/+10 | |
| | * | | | dist target: fixify OBJECTS_DIR against output dir | Oswald Buddenhagen | 2011-04-12 | 1 | -1/+2 | |
| | * | | | fix paths of vpath-resolved files | Oswald Buddenhagen | 2011-04-12 | 1 | -4/+3 | |
| | * | | | simplify: absolute fixification ignores the base dir arguments | Oswald Buddenhagen | 2011-04-12 | 1 | -1/+1 | |
| | * | | | simplify: fileFixify for all same paths is always "." | Oswald Buddenhagen | 2011-04-12 | 1 | -3/+1 | |
| | * | | | simplify: the input and output dirs are already normalized | Oswald Buddenhagen | 2011-04-12 | 1 | -1/+1 | |
| | * | | | stop fixifying after first success | Oswald Buddenhagen | 2011-04-12 | 1 | -0/+1 | |
| | * | | | create a pwd string with a trailing slash only on demand | Oswald Buddenhagen | 2011-04-12 | 1 | -6/+7 | |
| | * | | | useful location reporting for errors from QMAKE_SUBSTITUTES | Oswald Buddenhagen | 2011-04-12 | 3 | -1/+16 | |
| | * | | | prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed" | Oswald Buddenhagen | 2011-04-12 | 1 | -7/+7 | |
* | | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-27 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 8 | -7/+29 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-08 | 5 | -4/+26 | |
| |\ \ \ \ | ||||||
| | * | | | | Add support for -unset <prop> option to qmake. | Darryl L. Miles | 2011-04-08 | 5 | -4/+26 | |
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 3 | -3/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||||
| | * | | | win32-g++: Correct the order of linked Windows libraries | Jonathan Liu | 2011-04-04 | 3 | -3/+3 | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 2 | -4/+11 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-04-05 | 3 | -5/+5 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Fix emulator deployment for items with "!:" drive. | Miikka Heikkinen | 2011-03-16 | 1 | -1/+4 | |
| * | | | | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-03-16 | 10 | -69/+59 | |
| |\ \ \ \ | ||||||
| * | | | | | Removed broken "deploy.path" support from Symbian | Miikka Heikkinen | 2011-03-15 | 1 | -3/+1 | |
| * | | | | | Strip echo suppression character "@" from commands in symbian-sbsv2 | Miikka Heikkinen | 2011-03-10 | 1 | -0/+6 | |
* | | | | | | Merge remote branch 'origin/master' into 4.8-earth | Denis Dzyubenko | 2011-03-28 | 1 | -1/+0 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | |