diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 13:53:37 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 13:53:37 (GMT) |
commit | c7b6c35e2b32b5d85f90088906d7ca6ecfe47202 (patch) | |
tree | e489b6c938c9509a10ceb785bcf480798a0cb14a /src | |
parent | 8b610c28c1300e0aa800569225d8512d0b66ffce (diff) | |
parent | 6a80266dae9e05de0a68d6a69f5f5416f9dd5746 (diff) | |
download | Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.zip Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.tar.gz Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
add integrity gbuild to the project file for convenience
don't build activeqt examples on mingw
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
Updated Russian translation
Ukrainian translation updated for 4.8
retreving -> retrieving
Removed duplicate Spectrum Analyzer entry from demos doc page.
Removed obsolete QWS_ALPHA_CURSOR feature.
Removed duplicate link from QFinalState documentation.
Clarified keypad navigation specific event documentation.
docs: Typo and link fixes.
Use the right callback in QObject::disconnect()
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.txt | 7 | ||||
-rw-r--r-- | src/corelib/io/qprocess.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qcoreevent.h | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
-rw-r--r-- | src/corelib/statemachine/qfinalstate.cpp | 2 | ||||
-rw-r--r-- | src/gui/dialogs/qmessagebox.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/qtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkaccessbackend_p.h | 2 | ||||
-rw-r--r-- | src/sql/drivers/symsql/qsql_symsql.cpp | 6 |
12 files changed, 11 insertions, 29 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index ace1eea..1035631 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -324,9 +324,6 @@ #ifndef QT_NO_QWSEMBEDWIDGET # define QT_NO_QWSEMBEDWIDGET #endif -#ifndef QT_NO_QWS_ALPHA_CURSOR -# define QT_NO_QWS_ALPHA_CURSOR -#endif #ifndef QT_NO_QWS_CURSOR # define QT_NO_QWS_CURSOR #endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 18ae261..5aefdfe 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -247,9 +247,6 @@ #ifndef QT_NO_QWSEMBEDWIDGET # define QT_NO_QWSEMBEDWIDGET #endif -#ifndef QT_NO_QWS_ALPHA_CURSOR -# define QT_NO_QWS_ALPHA_CURSOR -#endif #ifndef QT_NO_QWS_CURSOR # define QT_NO_QWS_CURSOR #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index e0b8a8f..64d5f08 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -178,9 +178,6 @@ // QWSEmbedWidget //#define QT_NO_QWSEMBEDWIDGET -// Alpha Cursor -//#define QT_NO_QWS_ALPHA_CURSOR - // Decoration //#define QT_NO_QWS_DECORATION_DEFAULT diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 6b861d4..dea05e0 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -1268,13 +1268,6 @@ Requires: CURSOR Name: Cursor SeeAlso: ??? -Feature: QWS_ALPHA_CURSOR -Description: Supports alpha-blended cursors. -Section: Qt for Embedded Linux -Requires: -Name: Alpha Cursor -SeeAlso: ??? - Feature: QWS_MANAGER Description: Supports the window manager. Section: Qt for Embedded Linux diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index e900663..d70811c 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -2281,7 +2281,7 @@ QT_END_INCLUDE_NAMESPACE However, note that repeated calls to this function will recreate the list of environment variables, which is a non-trivial operation. - \note For new code, it is recommended to use QProcessEvironment::systemEnvironment() + \note For new code, it is recommended to use QProcessEnvironment::systemEnvironment() \sa QProcessEnvironment::systemEnvironment(), environment(), setEnvironment() */ diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 281367b..f1a0407 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -209,8 +209,8 @@ public: // last event id used = 132 #ifdef QT_KEYPAD_NAVIGATION - EnterEditFocus = 150, // enter edit mode in keypad navigation - LeaveEditFocus = 151, // enter edit mode in keypad navigation + EnterEditFocus = 150, // enter edit mode in keypad navigation (Defined only with QT_KEYPAD_NAVIGATION) + LeaveEditFocus = 151, // leave edit mode in keypad navigation (Defined only with QT_KEYPAD_NAVIGATION) #endif AcceptDropsChange = 152, diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 67dbadb..5d6e4d7 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3002,7 +3002,7 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal, } const void *cbdata[] = { sender, signal.mobj ? signalSignature.constData() : 0, receiver, method.mobj ? methodSignature.constData() : 0 }; - if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata)) + if (QInternal::activateCallbacks(QInternal::DisconnectCallback, (void **) cbdata)) return true; } diff --git a/src/corelib/statemachine/qfinalstate.cpp b/src/corelib/statemachine/qfinalstate.cpp index c583c32..7d65984 100644 --- a/src/corelib/statemachine/qfinalstate.cpp +++ b/src/corelib/statemachine/qfinalstate.cpp @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE machine.start(); \endcode - \sa QStateMachine::finished(), QState::finished() + \sa QState::finished() */ class QFinalStatePrivate : public QAbstractStatePrivate diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 66e7216..149e267 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -548,8 +548,8 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button) \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 6 This is the approach recommended in the - \l{http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGWindows/chapter_18_section_7.html} - {Mac OS X Guidlines}. Similar guidlines apply for the other + \l{http://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/20000961-BABCAJID} + {Mac OS X Guidelines}. Similar guidelines apply for the other platforms, but note the different ways the \l{QMessageBox::informativeText} {informative text} is handled for different platforms. diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index e0e8ce6..c7ae73f 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -440,7 +440,7 @@ void QToolBarPrivate::plug(const QRect &r) pop up a menu containing the items that does not currently fit in the toolbar. - When a QToolBar is not a child of a QMainWindow, it looses the ability + When a QToolBar is not a child of a QMainWindow, it loses the ability to populate the extension pop up with widgets added to the toolbar using addWidget(). Please use widget actions created by inheriting QWidgetAction and implementing QWidgetAction::createWidget() instead. diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index ff05306..7f6aff9 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/src/network/access/qnetworkaccessbackend_p.h @@ -110,9 +110,7 @@ public: // socket). virtual void open() = 0; -#ifndef QT_NO_BEARERMANAGEMENT virtual bool start(); -#endif virtual void closeDownstreamChannel() = 0; // slot-like: diff --git a/src/sql/drivers/symsql/qsql_symsql.cpp b/src/sql/drivers/symsql/qsql_symsql.cpp index 4ceac9b..f34212c 100644 --- a/src/sql/drivers/symsql/qsql_symsql.cpp +++ b/src/sql/drivers/symsql/qsql_symsql.cpp @@ -217,7 +217,7 @@ void QSymSQLResultPrivate::initColumns(QSqlRecord& rec) int nCols = stmt.ColumnCount(); if (nCols <= 0) { q->setLastError(qMakeError(access, QCoreApplication::translate("QSymSQLResult", - "Error retreving column count"), QSqlError::UnknownError, nCols)); + "Error retrieving column count"), QSqlError::UnknownError, nCols)); return; } @@ -227,7 +227,7 @@ void QSymSQLResultPrivate::initColumns(QSqlRecord& rec) if (err != KErrNone) { q->setLastError(qMakeError(access, QCoreApplication::translate("QSymSQLResult", - "Error retreving column name"), QSqlError::UnknownError, err)); + "Error retrieving column name"), QSqlError::UnknownError, err)); return; } @@ -240,7 +240,7 @@ void QSymSQLResultPrivate::initColumns(QSqlRecord& rec) if (err != KErrNone) { q->setLastError(qMakeError(access, QCoreApplication::translate("QSymSQLResult", - "Error retreving column type"), QSqlError::UnknownError, err)); + "Error retrieving column type"), QSqlError::UnknownError, err)); return; } |