summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/remoteclient_p.h
diff options
context:
space:
mode:
authorkh <karsten.heimrich@theqtcompany.com>2014-11-28 16:41:15 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2014-12-01 16:11:55 +0100
commit52e176b4a40d55b84aac762b77da5262687f6503 (patch)
tree221c07797e1edf60a40951e496beedb0d4cb15cd /src/libs/installer/remoteclient_p.h
parenta439e6fab484461744a657f5173a738622064edf (diff)
Fix online installation into directory with elevated permissions.
Inside the Resource class we can't use QFile, as that will access the elevated running server to read from a only client side mapped file. Adjust Resource::readData to behave properly with the file engine's nativeRead(...) implementation, e.g. on Unix it returns -1 if called to read with a size of 0 bytes. Do not write to the socket if we are running in a different thread than the one the socket was created in. Fix logically broken connect function. Task-number: QTIFW-572 Change-Id: I993b5d3a5c217b0aedbbc27837dce2619e51d224 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Takayuki ORITO <iori.ayane@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/remoteclient_p.h')
-rw-r--r--src/libs/installer/remoteclient_p.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/installer/remoteclient_p.h b/src/libs/installer/remoteclient_p.h
index fdcfabb64..6c1d41951 100644
--- a/src/libs/installer/remoteclient_p.h
+++ b/src/libs/installer/remoteclient_p.h
@@ -122,7 +122,6 @@ public:
, m_key(QLatin1String(Protocol::DefaultAuthorizationKey))
, m_mode(Protocol::Mode::Debug)
, m_object(0)
- , m_quit(false)
{
}
@@ -263,7 +262,6 @@ private:
QThread m_thread;
Protocol::Mode m_mode;
KeepAliveObject *m_object;
- volatile bool m_quit;
};
} // namespace QInstaller