summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/fsengineclient.cpp6
-rw-r--r--installerbuilder/libinstaller/fsengineclient.h1
-rw-r--r--installerbuilder/libinstaller/fsengineserver.cpp11
-rw-r--r--installerbuilder/libinstaller/fsengineserver.h1
4 files changed, 18 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/fsengineclient.cpp b/installerbuilder/libinstaller/fsengineclient.cpp
index 9b322900d..3df09b166 100644
--- a/installerbuilder/libinstaller/fsengineclient.cpp
+++ b/installerbuilder/libinstaller/fsengineclient.cpp
@@ -642,6 +642,12 @@ FSEngineClientHandler::FSEngineClientHandler( quint16 port, const QHostAddress&
Private::instance = this;
}
+void FSEngineClientHandler::enableTestMode()
+{
+ d->key = QLatin1String("testAuthorizationKey");
+ d->serverStarted = true;
+}
+
void FSEngineClientHandler::init( quint16 port, const QHostAddress& a )
{
d->address = a;
diff --git a/installerbuilder/libinstaller/fsengineclient.h b/installerbuilder/libinstaller/fsengineclient.h
index c84cb673e..99fb6e40b 100644
--- a/installerbuilder/libinstaller/fsengineclient.h
+++ b/installerbuilder/libinstaller/fsengineclient.h
@@ -61,6 +61,7 @@ public:
QAbstractFileEngine* create( const QString& fileName ) const;
+ void enableTestMode();
void setActive( bool active );
bool isActive() const;
bool isServerRunning() const;
diff --git a/installerbuilder/libinstaller/fsengineserver.cpp b/installerbuilder/libinstaller/fsengineserver.cpp
index 1be880156..fa608d1ec 100644
--- a/installerbuilder/libinstaller/fsengineserver.cpp
+++ b/installerbuilder/libinstaller/fsengineserver.cpp
@@ -259,7 +259,16 @@ void FSEngineServer::incomingConnection( quintptr socketDescriptor )
watchdog.resetTimeoutTimer();
}
#endif
-
+
+void FSEngineServer::enableTestMode()
+{
+ setAuthorizationKey(QLatin1String("testAuthorizationKey"));
+ //we don't want to kill the server,
+ //maybe we should introduce a call where the client can kill the server
+ watchdog.disconnect();
+}
+
+
/*!
Sets the authorization key this server is asking the clients for to \a authorizationKey.
*/
diff --git a/installerbuilder/libinstaller/fsengineserver.h b/installerbuilder/libinstaller/fsengineserver.h
index 20909f9e9..d7ff7a1cf 100644
--- a/installerbuilder/libinstaller/fsengineserver.h
+++ b/installerbuilder/libinstaller/fsengineserver.h
@@ -42,6 +42,7 @@ public:
FSEngineServer( const QHostAddress& address, quint16 port, QObject* parent = 0 );
~FSEngineServer();
+ void enableTestMode();
void setAuthorizationKey( const QString& key );
QString authorizationKey() const;