Commit e39feabbcdb10b47c7eaad14fe653e62280e6237

Tree SHA1: 7e2918f
Parent SHA1: 5f23d16 (Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1)
raw diff | raw patch

doc:	Fixed some qdoc warnings.


272	272	\omitvalue MacGLClearDrawable
273	273	\omitvalue NetworkReplyUpdated
274	274	\omitvalue FutureCallOut
275		\omitvalue CocoaRequestModal
276	275	\omitvalue UpdateSoftKeys
277	276	\omitvalue NativeGesture
278	277	*/


1379	1379	*/
1380	1380
1381	1381	/*!
1382		Replaces this pixmap's data with the given \a image using the specified
1383		\a flags to control the conversion. The \a flags argument is a
1384		bitwise-OR of the \l{Qt::ImageConversionFlags}. Passing 0 for \a
1385		flags sets all the default options.
	1382	Replaces this pixmap's data with the given \a image using the
	1383	specified \a flags to control the conversion. The \a flags
	1384	argument is a bitwise-OR of the \l{Qt::ImageConversionFlags}.
	1385	Passing 0 for \a flags sets all the default options. Returns true
	1386	if the result is that this pixmap is not null.
1386	1387
1387	1388	Note: this function was part of Qt 3 support in Qt 4.6 and earlier.
1388	1389	It has been promoted to official API status in 4.7 to support updating


533	533	return QByteArray();
534	534	}
535	535
	536	/*! \typedef QNetworkReply::RawHeaderPair
	537
	538	RawHeaderPair is a QPair<QByteArray, QByteArray> where the first
	539	QByteArray is the header name and the second is the header.
	540	*/
	541
	542	/*!
	543	Returns a list of raw header pairs.
	544	*/
536	545	const QList<QNetworkReply::RawHeaderPair>& QNetworkReply::rawHeaderPairs() const
537	546	{
538	547	Q_D(const QNetworkReply);


532	532	return d->priority;
533	533	}
534	534
	535	/*! \enum QNetworkRequest::Priority
	536
	537	\since 4.7
	538
	539	This enum lists the possible network request priorities.
	540
	541	\value HighPriority High priority
	542	\value NormalPriority Normal priority
	543	\value LowPriority Low priority
	544	*/
	545
535	546	/*!
536	547	\since 4.7
537	548
538		Set the priority of this request.
	549	Set the priority of this request to \a priority.
539	550
540		\note The priority is only a hint to the network access manager.
541		It can use it or not. Currently it is used for HTTP to
	551	\note The \a priority is only a hint to the network access
	552	manager. It can use it or not. Currently it is used for HTTP to
542	553	decide which request should be sent first to a server.
543	554
544	555	\sa priority()


1085	1085	/*!
1086	1086	\since 4.7
1087	1087
1088		Set the OpenGL version. If a context compatible with the requested OpenGL version
1089		cannot be created, a context compatible with version 1.x is created instead.
	1088	Set the OpenGL version to the \a major and \a minor numbers. If a
	1089	context compatible with the requested OpenGL version cannot be
	1090	created, a context compatible with version 1.x is created instead.
1090	1091
1091	1092	\sa majorVersion(), minorVersion()
1092	1093	*/
…	…
1130	1130	\enum QGLFormat::OpenGLContextProfile
1131	1131	\since 4.7
1132	1132
1133		This enum describes the OpenGL context profiles that can be specified for contexts implementing
1134		OpenGL version 3.2 or higher. These profiles are different from OpenGL ES profiles.
	1133	This enum describes the OpenGL context profiles that can be
	1134	specified for contexts implementing OpenGL version 3.2 or
	1135	higher. These profiles are different from OpenGL ES profiles.
1135	1136
1136	1137	\value NoProfile OpenGL version is lower than 3.2.
1137	1138	\value CoreProfile Functionality deprecated in OpenGL version 3.0 is not available.
…	…
1142	1142	/*!
1143	1143	\since 4.7
1144	1144
1145		Set the OpenGL context profile. The profile is ignored if the requested OpenGL
1146		version is less than 3.2.
	1145	Set the OpenGL context profile to \a profile. The \a profile is
	1146	ignored if the requested OpenGL version is less than 3.2.
1147	1147
1148	1148	\sa profile()
1149	1149	*/