diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:13:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:21:19 +0200 |
| commit | abd3b8030cbcc50379578b88ce6019e338ff8597 (patch) | |
| tree | 7a7acb89e594b57180e9823c4ab03dcce66d5b5f /sync.profile | |
| parent | 5cb581b3b4c3305a0dfebead1ec7049ab6f2ebc4 (diff) | |
| parent | 6f3bb0aafab877c34dea3d9141a9931b5a7914a5 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/widgets.pro
Change-Id: I697eec936c4e1a6c360edc8f0b472e23c0461ecb
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sync.profile b/sync.profile index de4db5bf85..e55a479de0 100644 --- a/sync.profile +++ b/sync.profile @@ -34,6 +34,7 @@ "qnamespace.h" => "Qt", "qnumeric.h" => "QtNumeric", "qvariant.h" => "QVariantHash,QVariantList,QVariantMap", + "qgl.h" => "QGL", "qsql.h" => "QSql", "qssl.h" => "QSsl", "qtest.h" => "QTest", |