diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:24:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:24:47 (GMT) |
| commit | 9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6 (patch) | |
| tree | 36687843f30efa62a4ac37e863da6d3984626be3 /doc | |
| parent | 0f3fd01523081656c27ebb7b495c4f1a1c927117 (diff) | |
| parent | 29ec793147054ea4beb1ad4adeebbbe1fe07b260 (diff) | |
| download | Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.zip Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.tar.gz Qt-9d0dff2d9d49f59b5c6cd0e53cd4d7f042e5d6a6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (64 commits)
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
don't try to build corewlan plugin when corewlan was not found at configure
Avoid conversion to/from QChar in the cn codec to unicode
Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
Allow empty authority in QUrl::setAuthority as per docs.
Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
fixed case of GL include directory
check in MAC_APPLICATION_MENU translations
Re-generate the Unicode tables after updates to the program that generates them
Fix the code after merge: DerivedNormalizationProps has two or more columns
add some usefull definitions to qunicodetables_p.h
qchar.cpp: fix identation
finish last commit
prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/developing-on-mac.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/development/developing-on-mac.qdoc b/doc/src/development/developing-on-mac.qdoc index 20eefb7..1eb829e 100644 --- a/doc/src/development/developing-on-mac.qdoc +++ b/doc/src/development/developing-on-mac.qdoc @@ -72,10 +72,10 @@ Carbon Qt can be developed on and deployed to 10.4, but there is no 64-bit support. - With Qt 4.7 we now reccommend using the Cocoa version of Qt for developement, + With Qt 4.7 we now recommend using the Cocoa version of Qt for development, unless you want to target the 10.4 platform. Qt now uses Cocoa by default, both for the binary package and when configuring from source. Download the - Carbon binarypackages or configure with "-carbon" to use that version. + Carbon binary packages or configure with "-carbon" to use that version. There are two versions of the Qt binary, one with x86 and x86_64 Cocoa and another with x86 and ppc Carbon. If you want a different setup |