diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-03-19 11:21:19 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-03-19 14:03:23 +0000 |
| commit | 16f033fb13a3005eefbe8b7b6ccc52bfda08649e (patch) | |
| tree | ec0fd8e7650314b79721992b0818dcba50d1f490 /src/nfc/qnearfieldtarget_emulator_p.h | |
| parent | a61ee48bc16fae61cabb9a242f3a7c19caa4cbfd (diff) | |
Address compile error on gcc 4.8
This partly reverts b3b387698e8f685e8bd4f4843a170da40e17249b.
The global static connect was not correct. Furthermore the new global
static variable was triggering
src/nfc/qnearfieldtarget_emulator_p.h:125:31:
warning: 'globalTagActivator' defined but not used [-Wunused-variable]
The global static variable is shifted to no longer require exposure
inside the header file.
Fixes: QTBUG-74538
Change-Id: Ic5e8211d358bae9c2ed0418aec5c4316fb249c98
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/nfc/qnearfieldtarget_emulator_p.h')
| -rw-r--r-- | src/nfc/qnearfieldtarget_emulator_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h index 1b9f7bdb..70a67be8 100644 --- a/src/nfc/qnearfieldtarget_emulator_p.h +++ b/src/nfc/qnearfieldtarget_emulator_p.h @@ -122,8 +122,6 @@ private: int timerId; }; -Q_GLOBAL_STATIC(TagActivator, globalTagActivator); - QT_END_NAMESPACE #endif // QNEARFIELDTARGET_EMULATOR_P_H |