summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+15
|
* Remove "no-stl" from the build key and add compatibility for old plugins.Thiago Macieira2009-07-291-2/+0
| | | | | | | | | | | | | | | | | STL support hasn't had binary compatibility effects for the entire lifetime of Qt 4, so it should never have been there. It is a legacy thing I am now correcting. When inspecting a plugin, remove the "no-stl" from its loaded build key. That indicates a pre-4.6 build, since now Qt no longer adds it to its own build keys. Note that you have to remove the 4.6 plugin cache from $HOME/.config/Trolltech.conf or the registry for this change to work (if you compile Qt with -no-stl). Otherwise, plugins that have already been scanned will fail to load. Reviewed-by: Bradley T. Hughes
* configure shows Windows CE specific build steps when its doneJoerg Bornemann2009-07-231-2/+10
| | | | | | | | | For cross compilation of Qt for Windows CE the user must call setcepaths before nmake. Now configure shows a helpful message if the xplatform configure switch was used. Task-number: 257352 Reviewed-by: thartman
* repair showSummary after commit 08b3511a0cJoerg Bornemann2009-07-231-1/+3
| | | | Reviewed-by: thartman
* configure -dont-process must build the host tools on Windows CEJoerg Bornemann2009-07-211-1/+1
| | | | Reviewed-by: mauricek
* Improve error message from configure.exe when trying to compile the Windows ↵David Faure2009-07-141-2/+8
| | | | | | | | | | phonon backend: - mention the DirectShow SDK, not the DirectX SDK (which doesn't include DirectShow anymore) - mention which exact files were not found, rather than just "all required files couldn't be found" Merge-request: 881 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix for mingw to still look into LIB and INCLUDE env varThierry Bastian2009-07-141-7/+6
|
* update to the configure program to support mingw+phononThierry Bastian2009-07-141-23/+37
|
* Disable private unit tests when Qt is configured withoutRohan McGovern2009-07-091-1/+4
| | | | | | | | | -developer-build, part 1. Adds QT_CONFIG+=private_tests to qconfig.pri when Qt is configured with -developer-build. Reviewed-by: Michael Goddard
* Merge commit 'origin/4.5'Bill King2009-07-081-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * Minor: fix spelling in configure.exe -help output.Thiago Macieira2009-07-021-1/+1
| | | | | | | | Reported via qt-bugs
* | tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-13/+6
| | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Fixes configure.exe silently disabling cetest even if you asked for itRohan McGovern2009-07-011-1/+9
| | | | | | | | | | | | when paths to the ActiveSync headers/libraries are not set up. Reviewed-by: Michael Goddard
* | Merge branch '4.5'Marius Storm-Olsen2009-06-301-4/+13
|\ \ | |/
| * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-4/+13
| | | | | | | | | | | | The configuration option was not added to the Windows configure. Reviewed-by: hjk
* | 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-161-2/+3
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | 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-081-3/+5
| | | | | | | | 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
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+3586