diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /sync.profile | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
| download | qtbase-6697f2a899fac47a65122a85691b2cfe63c6152c.tar.gz qtbase-6697f2a899fac47a65122a85691b2cfe63c6152c.tar.bz2 qtbase-6697f2a899fac47a65122a85691b2cfe63c6152c.zip | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sync.profile b/sync.profile index d0627b5c02..321c7f95b0 100644 --- a/sync.profile +++ b/sync.profile @@ -28,6 +28,15 @@ "qtconcurrentmap.h" => "QtConcurrentMap", "qtconcurrentfilter.h" => "QtConcurrentFilter", "qtconcurrentrun.h" => "QtConcurrentRun", + "qtcoreversion.h" => "QtCoreVersion", + "qtdbusversion.h" => "QtDBusVersion", + "qtguiversion.h" => "QtGuiVersion", + "qtnetworkversion.h" => "QtNetworkVersion", + "qtopenglversion.h" => "QtOpenGLVersion", + "qtopenvgversion.h" => "QtOpenVGVersion", + "qtsqlversion.h" => "QtSqlVersion", + "qttestversion.h" => "QtTestVersion", + "qtxmlversion.h" => "QtXmlVersion", ); %mastercontent = ( "core" => "#include <QtCore/QtCore>\n", |