diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
| commit | 0e96b5fe482802935ae202e2297404845e440d71 (patch) | |
| tree | 79c566f18bc605261f69d750d2935b91edba3861 /config.tests/common/pch/header.h | |
| parent | da43362921a62ea3163a042be20ec0f550d05cfa (diff) | |
| parent | 5733dfbd90fd059e7310786faefb022b00289592 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
src/widgets/kernel/qtooltip.cpp
Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
Diffstat (limited to 'config.tests/common/pch/header.h')
| -rw-r--r-- | config.tests/common/pch/header.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config.tests/common/pch/header.h b/config.tests/common/pch/header.h deleted file mode 100644 index ebc22c4fb0..0000000000 --- a/config.tests/common/pch/header.h +++ /dev/null @@ -1 +0,0 @@ -#define HEADER_H |