Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 7 | -28/+97 |
|\ | |||||
| * | Implement Q_PRIVATE_PROPERTY that allows you to declare properties | Alexis Menard | 2010-03-19 | 7 | -28/+97 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove the OBJECTS_DIR variable assignment from some projets in Qt. | Jocelyn Turcotte | 2010-03-04 | 1 | -1/+0 |
* | | | Added Symbian def file support to Linux build system. | axis | 2010-03-08 | 2 | -2/+10 |
* | | | Implemented recursive "sis" target and enabled sis_targets feature. | axis | 2010-02-23 | 2 | -0/+11 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 4 | -8/+10 |
| |\ \ | |||||
| * \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 5 | -42/+42 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 76 | -81/+96 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 1 | -3/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 1 | -11/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix certain type-const-ref syntax not recognized by normalizedSignature() | Bradley T. Hughes | 2009-11-30 | 1 | -1/+1 |
* | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 4 | -10/+13 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | uic: Fixed code generating setCentralWidget()-calls of QMainWindow. | Friedemann Kleint | 2010-02-04 | 1 | -2/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-03 | 3 | -8/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Designer/uic/related examples: Fix source code scanning issues II. | Friedemann Kleint | 2010-02-01 | 3 | -8/+8 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Add a warning when there are duplicate aliases in a resource file. | Pierre Rossi | 2010-02-02 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | Make link bootstrap again. | Thomas Zander | 2010-02-08 | 1 | -2/+2 |
* | | | | | | | Fix linking for armlink | Thomas Zander | 2010-02-04 | 1 | -3/+3 |
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-26 | 5 | -42/+42 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | uic3: Introduced option to preserve layout object names of Designer 3. | Friedemann Kleint | 2010-01-21 | 5 | -42/+42 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-21 | 76 | -84/+100 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | doc: Explained parameter value defaults where appropriate. | Martin Smith | 2010-01-08 | 1 | -5/+20 |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-07 | 76 | -76/+76 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 76 | -76/+76 |
| | | |_|/ | | |/| | | |||||
| * | | | | uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup | David Faure | 2010-01-05 | 1 | -3/+4 |
| |/ / / | |||||
* | | | | Fixed makefile generation for Symbian. | axis | 2010-01-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix moc generated code with dummy Q_PROPERTY | Olivier Goffart | 2009-12-16 | 1 | -11/+0 |
| |/ |/| | |||||
* | | Do not recoginze templated types or pointers as flags. | Olivier Goffart | 2009-11-30 | 1 | -1/+2 |
|/ | |||||
* | Fix build on AIX: all of the .a file is linked into the program. | Oswald Buddenhagen | 2009-11-24 | 1 | -7/+3 |
* | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-19 | 1 | -2/+2 |
|\ | |||||
| * | Ran the script utils/normalize | Olivier Goffart | 2009-11-18 | 1 | -2/+2 |
* | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-18 | 1 | -40/+0 |
|\ \ | |/ | |||||
| * | Revert "Added a standard copyright header to files generated by rcc." | Olivier Goffart | 2009-11-16 | 1 | -40/+0 |
* | | uic: Call to setCentralWidget() not generated for promoted central widgets. | Friedemann Kleint | 2009-11-16 | 1 | -1/+1 |
* | | fix shadow builds following bootstrap changes | Oswald Buddenhagen | 2009-11-12 | 1 | -0/+1 |
* | | uic3: Fix compilation | Friedemann Kleint | 2009-11-11 | 2 | -0/+6 |
* | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-10 | 2 | -2/+74 |
|\ \ | |/ | |||||
| * | Fix failing sub-src target | Marius Storm-Olsen | 2009-11-10 | 1 | -4/+6 |
| * | Merge branch '4.6-api-review' into 4.6 | Marius Storm-Olsen | 2009-11-09 | 1 | -2/+2 |
| |\ | |||||
| | * | API review: Rename functions numColors(), setNumColors() and numBytes() | Marius Storm-Olsen | 2009-11-06 | 1 | -2/+2 |
| * | | Ensure IDC and UIC3 dependencies are correct | Marius Storm-Olsen | 2009-11-05 | 1 | -5/+4 |
| * | | Add src/tools/tools.pro, and use when building host tools for xcompiling | Marius Storm-Olsen | 2009-11-04 | 1 | -0/+71 |
| |/ | |||||
* | | uic/Designer: Use correct margin defaults for custom page-based containers. | Friedemann Kleint | 2009-11-10 | 5 | -3/+22 |
* | | build lrelease bootstrapped | Oswald Buddenhagen | 2009-11-10 | 2 | -3/+7 |
|/ | |||||
* | Added a standard copyright header to files generated by rcc. | Martin Smith | 2009-09-09 | 1 | -0/+40 |
* | Update license headers again. | Jason McDonald | 2009-09-09 | 76 | -304/+304 |