summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2014-11-14 23:33:49 +0100
committerTannin <devnull@localhost>2014-11-14 23:33:49 +0100
commit9907437d937060a55a91c085c1d82e12b995bc01 (patch)
tree62a625d81b7344edb6f7a1c74263ccf392e0935d /src
parent3b7a468f73a11ee92be5200de4575ef749db51c3 (diff)
- fixed manifest for qt5
- download messages can now be sent from different user accounts
Diffstat (limited to 'src')
-rw-r--r--src/dlls.manifest.qt512
-rw-r--r--src/singleinstance.cpp2
2 files changed, 12 insertions, 2 deletions
diff --git a/src/dlls.manifest.qt5 b/src/dlls.manifest.qt5
index 5a22c2a8..59918f2b 100644
--- a/src/dlls.manifest.qt5
+++ b/src/dlls.manifest.qt5
@@ -7,12 +7,20 @@
<file name="Qt5Core.dll"/>
<file name="Qt5Declarative.dll"/>
<file name="Qt5Gui.dll"/>
- <file name="Qt5Quick.dll"/>
+ <file name="Qt5Multimedia.dll"/>
+ <file name="Qt5MultimediaWidgets.dll"/>
<file name="Qt5Network.dll"/>
+ <file name="Qt5OpenGL.dll"/>
+ <file name="Qt5Positioning.dll"/>
+ <file name="Qt5PrintSupport.dll"/>
+ <file name="Qt5Qml.dll"/>
+ <file name="Qt5Quick.dll"/>
+ <file name="Qt5Sensors.dll"/>
<file name="Qt5Script.dll"/>
<file name="Qt5Sql.dll"/>
<file name="Qt5Svg.dll"/>
+ <file name="Qt5WebKit.dll"/>
+ <file name="Qt5WebKitWidgets.dll"/>
<file name="Qt5Widgets.dll"/>
- <file name="Qt5Xml.dll"/>
<file name="Qt5XmlPatterns.dll"/>
</assembly> \ No newline at end of file
diff --git a/src/singleinstance.cpp b/src/singleinstance.cpp
index a1928523..dcb0fc78 100644
--- a/src/singleinstance.cpp
+++ b/src/singleinstance.cpp
@@ -54,6 +54,8 @@ SingleInstance::SingleInstance(bool forcePrimary, QObject *parent) :
}
if (m_PrimaryInstance) {
connect(&m_Server, SIGNAL(newConnection()), this, SLOT(receiveMessage()));
+ // has to be called before listen
+ m_Server.setSocketOptions(QLocalServer::WorldAccessOption);
m_Server.listen(s_Key);
}
}