diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:30:37 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:31:08 +0200 |
| commit | d8ba3610e2d2e6c31d1a53666dba02100f67d7d9 (patch) | |
| tree | 44c6a3cbefaf56da2e11893bf4357e6fa2aad26e /src | |
| parent | 66a9352083f29737022d94a32a8edbc0db854aaa (diff) | |
| download | qt3-d8ba3610e2d2e6c31d1a53666dba02100f67d7d9.tar.gz qt3-d8ba3610e2d2e6c31d1a53666dba02100f67d7d9.zip | |
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5431226296e2607b37b4f666ee970bddb5fd5707)
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/qgplugin.h | 8 | ||||
| -rw-r--r-- | src/tools/qcom_p.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/qgplugin.h b/src/kernel/qgplugin.h index ba0914b..5ebcc5d 100644 --- a/src/kernel/qgplugin.h +++ b/src/kernel/qgplugin.h @@ -81,10 +81,10 @@ #ifndef Q_PLUGIN_VERIFICATION_DATA # define Q_PLUGIN_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="QT_VERSION_STR"\n" \ - "flags="Q_PLUGIN_FLAGS_STRING"\n" \ - "buildkey="QT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" QT_VERSION_STR "\n" \ + "flags=" Q_PLUGIN_FLAGS_STRING "\n" \ + "buildkey=" QT_BUILD_KEY "\0"; #endif // Q_PLUGIN_VERIFICATION_DATA #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index 2d53c15..f563d4f 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -296,10 +296,10 @@ public: \ #ifndef Q_UCM_VERIFICATION_DATA # define Q_UCM_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="QT_VERSION_STR"\n" \ - "flags="Q_UCM_FLAGS_STRING"\n" \ - "buildkey="QT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" QT_VERSION_STR "\n" \ + "flags=" Q_UCM_FLAGS_STRING "\n" \ + "buildkey=" QT_BUILD_KEY "\0"; #endif // Q_UCM_VERIFICATION_DATA // This macro expands to the default implementation of ucm_instantiate. |