diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2018-06-06 11:29:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 11:29:35 +0200 |
| commit | da70392f6959e16243272e8abccebd95f8bfaf47 (patch) | |
| tree | ac99a60a37cc6c5abdcaa6deb538b52ad8307f86 | |
| parent | 02e1d1538af3337134bd7381dcd95f8d7775b30f (diff) | |
| parent | 4b42755619011c117a76bdf98e417ebedc47e319 (diff) | |
| download | twinkle-da70392f6959e16243272e8abccebd95f8bfaf47.tar twinkle-da70392f6959e16243272e8abccebd95f8bfaf47.tar.gz twinkle-da70392f6959e16243272e8abccebd95f8bfaf47.tar.lz twinkle-da70392f6959e16243272e8abccebd95f8bfaf47.tar.xz twinkle-da70392f6959e16243272e8abccebd95f8bfaf47.zip | |
Merge pull request #125 from mkubecek/tmp/qt-5.11
fix Qt 5.11 build (issue #124)
| -rw-r--r-- | src/gui/diamondcardprofileform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/getprofilenameform.cpp | 2 | ||||
| -rw-r--r-- | src/gui/inviteform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/mphoneform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/numberconversionform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/syssettingsform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/userprofileform.cpp | 1 | ||||
| -rw-r--r-- | src/gui/wizardform.cpp | 1 |
8 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/diamondcardprofileform.cpp b/src/gui/diamondcardprofileform.cpp index 6656909..517180b 100644 --- a/src/gui/diamondcardprofileform.cpp +++ b/src/gui/diamondcardprofileform.cpp @@ -21,6 +21,7 @@ #include <QRegExp> #include <QValidator> +#include <QRegExpValidator> #include "gui.h" #include "diamondcard.h" #include "getprofilenameform.h" diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.cpp index 1319e1d..89c715e 100644 --- a/src/gui/getprofilenameform.cpp +++ b/src/gui/getprofilenameform.cpp @@ -1,7 +1,7 @@ #include "getprofilenameform.h" - #include <QDir> #include <QMessageBox> +#include <QRegExpValidator> #include "user.h" #include "protocol.h" diff --git a/src/gui/inviteform.cpp b/src/gui/inviteform.cpp index 433fb22..2a5b68d 100644 --- a/src/gui/inviteform.cpp +++ b/src/gui/inviteform.cpp @@ -7,6 +7,7 @@ #include "sys_settings.h" #include <QRegExp> #include <QValidator> +#include <QRegExpValidator> /* Copyright (C) 2005-2009 Michel de Boer <michel@twinklephone.com> diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp index 260fda7..c4e3c1d 100644 --- a/src/gui/mphoneform.cpp +++ b/src/gui/mphoneform.cpp @@ -54,6 +54,7 @@ #include <QRegExp> #include <QValidator> #include <QSettings> +#include <QRegExpValidator> #include "buddyform.h" #include "diamondcardprofileform.h" #include "osd.h" diff --git a/src/gui/numberconversionform.cpp b/src/gui/numberconversionform.cpp index f8ae64c..8481a9b 100644 --- a/src/gui/numberconversionform.cpp +++ b/src/gui/numberconversionform.cpp @@ -1,5 +1,6 @@ #include "numberconversionform.h" +#include <QRegExpValidator> #include "gui.h" /* diff --git a/src/gui/syssettingsform.cpp b/src/gui/syssettingsform.cpp index 216af54..355df59 100644 --- a/src/gui/syssettingsform.cpp +++ b/src/gui/syssettingsform.cpp @@ -28,6 +28,7 @@ #include "twinkle_config.h" #include <QRegExp> #include <QValidator> +#include <QRegExpValidator> #include "syssettingsform.h" /* * Constructs a SysSettingsForm as a child of 'parent', with the diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp index 28700a6..9ed9209 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp @@ -31,6 +31,7 @@ #include <QStringList> #include "twinkle_config.h" #include <QListWidget> +#include <QRegExpValidator> #include "numberconversionform.h" #include "util.h" #include "userprofileform.h" diff --git a/src/gui/wizardform.cpp b/src/gui/wizardform.cpp index 777aa12..f925875 100644 --- a/src/gui/wizardform.cpp +++ b/src/gui/wizardform.cpp @@ -23,6 +23,7 @@ #include <QTextStream> #include "gui.h" #include <QFile> +#include <QRegExpValidator> #include "wizardform.h" #define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)") |