diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:13:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:14:15 +0100 |
| commit | 846cc4c75cc06def67e831c8cb3c9edaef24f8f0 (patch) | |
| tree | cf8cd76a5a610a6264583148b2c0549f7514dde3 /sync.profile | |
| parent | 9e4a215a2569a04010292c8718d0f0569bc06c12 (diff) | |
| parent | 0d0fb04d505d105fb4b2fc71d68f729ce670b12e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sync.profile b/sync.profile index 7bd10b4865..9823aa16bd 100644 --- a/sync.profile +++ b/sync.profile @@ -24,6 +24,7 @@ %classnames = ( "qglobal.h" => "QtGlobal", "qendian.h" => "QtEndian", + "qconfig.h" => "QtConfig", "qplugin.h" => "QtPlugin", "qalgorithms.h" => "QtAlgorithms", "qcontainerfwd.h" => "QtContainerFwd", @@ -31,6 +32,7 @@ "qevent.h" => "QtEvents", "qnamespace.h" => "Qt", "qnumeric.h" => "QtNumeric", + "qvariant.h" => "QVariantHash,QVariantList,QVariantMap", "qsql.h" => "QSql", "qssl.h" => "QSsl", "qtest.h" => "QTest", @@ -44,13 +46,6 @@ "QGenericPluginFactory" => "QtGui/QGenericPluginFactory" } ); -%explicitheaders = ( - "QtCore" => { - "QVariantHash" => "qvariant.h", - "QVariantList" => "qvariant.h", - "QVariantMap" => "qvariant.h", - } -); @qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ ); my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h'); |