summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-1/+0
|\ | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * revert built-time qm generationOswald Buddenhagen2009-06-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-168-16/+17
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-168-16/+16
| | | | | | | | Reviewed-by: Trust Me
| * fix qm buildOswald Buddenhagen2009-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-20/+23
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Only display the choice of license if we can find the filesMarius Storm-Olsen2009-05-291-20/+23
| | | | | | | | | | | | Task-number: 254451 Reviewed-by: eskil BT: yes
* | Merge branch '4.5'Tom Cooksey2009-05-281-0/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-281-0/+1
| | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
* | Merge branch '4.5'Thiago Macieira2009-05-141-0/+13
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Turning on LTCG affected too many projects, where customers applications would take a long time linking, severly affecting their development time (even though it was only added for release builds) We turn it off by default, and add a -ltcg configuration option, and the possibility to also do CONFIG+=ltcg in projects, should they not want it for Qt, but in their own projects. (Same, they can build Qt with it, and do CONFIG-=ltcg for their project) Reviewed-by: andy
* | Remove the Direct3D engine.Gunnar Sletta2009-04-241-57/+2
|/
* update/fix configureMaurice Kalinowski2009-04-082-3/+12
| | | | | | | | Reviewed-by: Thiago - display the nokia internal usage text like on configure - instead of skipping the license check we need to actually call it to set QT_EDITION and friends properly. Otherwise the build gets broken.
* Don't check license for internal configurationsMarius Storm-Olsen2009-04-081-1/+2
| | | | | | | A Nokia build doesn't require a license. Reviewed-by: mauricek BT: yes
* Fixes: Support for OpenGL ES 2.0 in configure.exe (Windows CE)Thomas Hartmann2009-04-071-1/+13
| | | | | RevBy: Joerg Details: -opengl-es-2 option for configure.exe
* Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-041-21/+14
| | | | | Reviewed-by: TrustMe BT: yes
* Add missing copyright headers and the "we mean it" section.Thiago Macieira2009-03-312-0/+82
| | | | | | These were reported by mkdist Reviewed-by: TrustMe
* Long live Qt 4.5!Lars Knoll2009-03-239-0/+5024