diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 07:54:09 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-20 07:54:09 +0000 |
commit | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (patch) | |
tree | fbcad900b0b604a1005320c5015723c343807974 /mkspecs/freebsd-g++/qplatformdefs.h | |
parent | 683c30074e4b7c9048e9970de1851e5d9a6deeb4 (diff) | |
parent | e32f1a4d61f0c55d066a43657ad607131be8ca34 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'mkspecs/freebsd-g++/qplatformdefs.h')
-rw-r--r-- | mkspecs/freebsd-g++/qplatformdefs.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index a7305fe8ea..0e3fd6b2b8 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -37,4 +37,9 @@ ** ****************************************************************************/ -#include "../freebsd-clang/qplatformdefs.h" +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +#include "../common/bsd/qplatformdefs.h" + +#endif // QPLATFORMDEFS_H |