FCL/sf/mw/qt: comparison src/corelib/global/qnamespace.qdoc

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
-** No Commercial Usage
+** Commercial Usage
-** This file contains pre-release code and may not be distributed.
+** Licensees holding valid Qt Commercial licenses may use this file in
-** You may use this file in accordance with the terms and conditions
+** accordance with the Qt Commercial License Agreement provided with the
-** contained in the Technology Preview License Agreement accompanying
+** Software or, alternatively, in accordance with the terms contained in a
-** this package.
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
+** GNU Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU Free
-** General Public License version 2.1 as published by the Free Software
+** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
+** Foundation and appearing in the file included in the packaging of this
-** packaging of this file.  Please review the following information to
+** file.
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 /*!
 return a value that includes the width of trailing spaces in the text; otherwise
 this width is excluded.
 \value TextIncludeTrailingSpaces Same as IncludeTrailingSpaces
 \value TextJustificationForced Ensures that text lines are justified.
+\omitvalue TextBypassShaping
 \omitvalue BreakAnywhere
 \omitvalue DontClip
 \omitvalue DontPrint
 \omitvalue ExpandTabs
 \omitvalue IncludeTrailingSpaces
 \value TextDate The default Qt format, which includes the day and month name,
 the day number in the month, and the year in full. The day and month names will
 be short, localized names. This is basically equivalent to using the date format
 string, "ddd MMM d yyyy". See QDate::toString() for more information.
-\value ISODate ISO 8601 extended format: either \c{YYYY-MM-DD} for dates or
+\value ISODate \l{ISO 8601} extended format: either \c{YYYY-MM-DD} for dates or
-\c{YYYY-MM-DDTHH:MM:SS} for combined dates and times.
+\c{YYYY-MM-DDTHH:MM:SS}, \c{YYYY-MM-DDTHH:MM:SSTZD} (e.g., 1997-07-16T19:20:30+01:00)
+for combined dates and times.
 \value SystemLocaleShortDate The \l{QLocale::ShortFormat}{short format} used
 by the \l{QLocale::system()}{operating system}.
 \value SystemLocaleLongDate The \l{QLocale::LongFormat}{long format} used
 \omitvalue Key_BackSpace
 \value Key_Return
 \value Key_Enter     Typically located on the keypad.
 \value Key_Insert
 \value Key_Delete
-\value Key_Pause
+\value Key_Pause    The Pause/Break key (\note Not anything to do with pausing media)
 \value Key_Print
 \value Key_SysReq
 \value Key_Clear
 \value Key_Home
 \value Key_End
 \value Key_BassBoost
 \value Key_BassUp
 \value Key_BassDown
 \value Key_TrebleUp
 \value Key_TrebleDown
-\value Key_MediaPlay
+\value Key_MediaPlay    A key setting the state of the media player to play
-\value Key_MediaStop
+\value Key_MediaStop    A key setting the state of the media player to stop
 \value Key_MediaPrevious
 \omitvalue Key_MediaPrev
 \value Key_MediaNext
 \value Key_MediaRecord
+\value Key_MediaPause   A key setting the state of the media player to pause (\note not the pause/break key)
+\value Key_MediaTogglePlayPause   A key to toggle the play/pause state in the media player (rather than setting an absolute state)
 \value Key_HomePage
 \value Key_Favorites
 \value Key_Search
 \value Key_Standby
 \value Key_OpenUrl
 \value Key_Suspend
 \value Key_ContrastAdjust
 \value Key_MediaLast
 \value Key_unknown
-\value Key_Call
+\value Key_Call     A key to answer or initiate a call (see Qt::Key_ToggleCallHangup for a key to toggle current call state)
-\value Key_Camera
+\value Key_Camera   A key to activate the camera shutter
-\value Key_CameraFocus
+\value Key_CameraFocus  A key to focus the camera
 \value Key_Context1
 \value Key_Context2
 \value Key_Context3
 \value Key_Context4
 \value Key_Flip
-\value Key_Hangup
+\value Key_Hangup   A key to end an ongoing call (see Qt::Key_ToggleCallHangup for a key to toggle current call state)
 \value Key_No
 \value Key_Select
 \value Key_Yes
+\value Key_ToggleCallHangup A key to toggle the current call state (ie. either answer, or hangup) depending on current call state
+\value Key_VoiceDial
+\value Key_LastNumberRedial
 \value Key_Execute
 \value Key_Printer
 \value Key_Play
 \value Key_Sleep
 */
 /*!
 \enum Qt::LayoutDirection
-Specifies the direction of Qt's layouts:
+Specifies the direction of Qt's layouts and text handling.
 \value LeftToRight  Left-to-right layout.
 \value RightToLeft  Right-to-left layout.
+\value LayoutDirectionAuto   Automatic layout.
 Right-to-left layouts are necessary for certain languages,
 notably Arabic and Hebrew.
-\sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection()
+LayoutDirectionAuto serves two purposes. When used in conjunction with widgets and layouts, it
+will imply to use the layout direction set on the parent widget or QApplication. This
+has the same effect as QWidget::unsetLayoutDirection().
+When LayoutDirectoinAuto is used in conjunction with text layouting, it will imply that the text
+directionality is determined from the content of the string to be layouted.
+\sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft()
 */
 /*!
 \enum Qt::AnchorPoint

changeset 33	3e2da88830cd
parent 30	5dc02b23752f