diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
| commit | 47b7af3bfd78c6d4efd3ce93be275a60430679d2 (patch) | |
| tree | e7d7ff32ae72008b74df37e13caf568b33ac19b5 /configure | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| parent | 39523f9f78a7c93643924711b1ed8006ebfcf5ce (diff) | |
| download | Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.zip Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.gz Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Manual resolve of conflict in changes-4.6.2 in staging-2.
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3369,10 +3369,10 @@ Configure options: -debug-and-release . Compile and link two versions of Qt, with and without debugging turned on (Mac only). - -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting) + -developer-build ... Compile and link Qt with Qt developer options (including auto-tests exporting) - -opensource......... Compile and link the Open-Source Edition of Qt. - -commercial......... Compile and link the Commercial Edition of Qt. + -opensource ........ Compile and link the Open-Source Edition of Qt. + -commercial ........ Compile and link the Commercial Edition of Qt. * -shared ............ Create and use shared Qt libraries. @@ -3765,7 +3765,7 @@ Qt/X11 only: Requires fontconfig/fontconfig.h, libfontconfig, freetype.h and libfreetype. - $XIN -no-xinput.......... Do not compile Xinput support. + $XIN -no-xinput ......... Do not compile Xinput support. $XIY -xinput ............ Compile Xinput support. This also enabled tablet support which requires IRIX with wacom.h and libXi or XFree86 with X11/extensions/XInput.h and libXi. |