diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-22 13:24:16 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-22 13:24:16 (GMT) |
| commit | 6a17647e7ac5a498f8495de434b946632172f291 (patch) | |
| tree | 680eb720b39ac2a0711c5aa05ccd502fa19f179d /src/corelib | |
| parent | 1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5 (diff) | |
| parent | 394fddbe1ed93f8aafc29ace8217ad8d77e7276f (diff) | |
| download | Qt-6a17647e7ac5a498f8495de434b946632172f291.zip Qt-6a17647e7ac5a498f8495de434b946632172f291.tar.gz Qt-6a17647e7ac5a498f8495de434b946632172f291.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qnoncontiguousbytedevice_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index e55a46c..34d6980 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -72,9 +72,11 @@ public: void disableReset(); virtual qint64 size() = 0; + virtual ~QNonContiguousByteDevice(); + protected: QNonContiguousByteDevice(); - virtual ~QNonContiguousByteDevice(); + bool resetDisabled; Q_SIGNALS: |