summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-10-20 15:55:02 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-10-27 10:49:19 (GMT)
commite5df3b4eeaf5943f5170dda781c3c589fa35a15a (patch)
tree798849b453b6ff7958abd772a24dda57517db84d /src/corelib
parent19bd31fc84cc4916aef4835429fc4a55e85d0c28 (diff)
downloadQt-e5df3b4eeaf5943f5170dda781c3c589fa35a15a.zip
Qt-e5df3b4eeaf5943f5170dda781c3c589fa35a15a.tar.gz
Qt-e5df3b4eeaf5943f5170dda781c3c589fa35a15a.tar.bz2
QIODevice - disallow setTextMode when not open
Calling setTextMode() before open() would make the device appear to be already open and cause later errors. Added a qWarning and documentation update to prevent this API misuse Task-number: QTBUG-20905 Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> (cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qiodevice.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index dae4e82..56fff90 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -468,11 +468,17 @@ void QIODevice::setOpenMode(OpenMode openMode)
otherwise the \l Text flag is removed. This feature is useful for classes
that provide custom end-of-line handling on a QIODevice.
+ The IO device should be opened before calling this function.
+
\sa open(), setOpenMode()
*/
void QIODevice::setTextModeEnabled(bool enabled)
{
Q_D(QIODevice);
+ if (!isOpen()) {
+ qWarning("QIODevice::setTextModeEnabled: The device is not open");
+ return;
+ }
if (enabled)
d->openMode |= Text;
else