Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ | Oswald Buddenhagen | 2010-04-30 | 3 | -3/+3 |
| | | | | Reviewed-by: joerg | ||||
* | add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX | Oswald Buddenhagen | 2010-02-26 | 3 | -0/+3 |
| | | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO | ||||
* | Fix copyright year. | Jason McDonald | 2010-02-16 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2010-01-14 | 21 | -21/+21 |
|\ | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp | ||||
| * | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 21 | -21/+21 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | fix headers | Warwick Allison | 2009-10-29 | 1 | -16/+16 |
| | | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-04 | 3 | -9/+20 |
|\ \ | |/ | | | | | | | | | | | kinetic-declarativeui Conflicts: configure | ||||
| * | renaming ppc mkspec to powerpc | Jørgen Lind | 2009-10-02 | 2 | -0/+0 |
| | | | | | | | | Reviewed-by:paul | ||||
| * | Give the qws ppc mkspec usable default values | Jørgen Lind | 2009-10-02 | 1 | -0/+11 |
| | | | | | | | | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom | ||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 21 | -84/+84 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | ||||
| * | Update license headers again. | Jason McDonald | 2009-09-09 | 21 | -84/+84 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-31 | 21 | -273/+273 |
|\ \ | |/ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp | ||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 21 | -273/+273 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-31 | 4 | -0/+164 |
|\ \ | |/ | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp | ||||
| * | Add missing license headers. | Jason McDonald | 2009-08-28 | 4 | -0/+164 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Update license headers. | Jason McDonald | 2009-08-11 | 17 | -17/+17 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-13 | 17 | -17/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h | ||||
| * | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 17 | -17/+17 |
| |/ | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-06-19 | 17 | -34/+34 |
|\ \ | |/ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp | ||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 17 | -34/+34 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 42 | -0/+1329 |
| | |||||
* | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 2 | -0/+62 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 42 | -0/+1329 |