diff options
| author | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
| commit | 8e774982be169f33fe4f4c687885d96f1c4e5ab4 (patch) | |
| tree | f4d8042b531ef15024cd9e56a9569f3939950e96 /src/shared | |
| parent | New Feature: Showing client toolbar while vnc server is running. (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.gz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.xz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/client/connectwindow/connectwindow.h
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/settings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/settings.h b/src/shared/settings.h index c1c45c1..2713693 100644 --- a/src/shared/settings.h +++ b/src/shared/settings.h @@ -1,6 +1,8 @@ #ifndef _SETTINGS_H_ #define _SETTINGS_H_ +#include <QString> + #define CLIENT_PORT 5194 static const QString CLIENT_PORT_STR(QString::number(CLIENT_PORT)); static const QByteArray CLIENT_PORT_ARRAY(QString::number(CLIENT_PORT).toUtf8()); |