Landing current branch 'fix_group_dlg'.
Switched to branch 3.0. Updating branch...
The following commit(s) will be landed:

c210b93 Address review comments.
0fdd9ea Port the Group dialog widget.  Was missed from the Qt5 porting.
1e9413f Merge branch '3.0'
eabeab1 Add and improve user scripting api docs from 2.9
0944e7c Add missing features from 2.9
7578bfc SVN_SILENT made messages (.desktop file) - always resolve ours
02a8504 Merge branch '3.0'
6c87e30 GIT_SILENT Exclude private and plugin files from API docs
f3a6b85 Really fix interpreter being empty
67ee994 Set the default interpreter to javascript if it is empty
d74b785 Possible fix for T668
7e339dc Fix field type not updating report dirty state
66ded8e Modernize the code: use override and nullptr
27e1fb2 Merge branch '3.0'
7e87020 Merge branch '3.0'
c39be78 SVN_SILENT made messages (.desktop file) - always resolve ours
8472e22 GIT_SILENT Revert removal of ~KReportDesigner by mistake from 40ea5fff1c086
2c6c4ee GIT_SILENT Move/clean code/remove unused
40ea5ff GIT_SILENT Clean up constructor
01f1019 No longer needed code
c53cc1f GIT_SILENT Move includes to .cpp
bc7a9de Fix initialization of report elements created by user, e.g. barcodes had invalid default settings
ffcf691 Rename KRTextStyleData to KReportTextStyleData
acab7fa Remove unnescessary strings for translation
1c74f59 Linestyle width > weight
1ece3fb Linestyle improvements from 3.0
e113f99 Add missing KReportView::moveToPage(int)
7e03cbf Merge branch '3.0'
a75e62d SVN_SILENT made messages (.desktop file) - always resolve ours
469cbb7 Merge remote-tracking branch 'origin/3.0'
1af771e API: Make KReportDesignerSection constructed by KReportDesigner, hide the zoom handler, use more stack, some renames
8db44d2 GIT_SILENT Add missing parameter names, don't use set**(bool = ...) in APIs
23ba7d0 GIT_SILENT Remove unused declarations from KReportItemField.h
b373ad1 +cmake NO_POLICY_SCOPE
376b1fc Bump dependency on Qt and KF5 to match other Kexi libs
5cc96ac Switch to CMakePackageConfigHelpers, hide a CMP0053 warning, sort cmake includes
e153261 3.0.x: Check if KProperty* libs are not newer than 3.0.x
bb1039d Simplify autotest build using ecm_add_tests()
bccf32c Port QRegExp to QRegularExpression in KReport
8cef692 SVN_SILENT made messages (.desktop file) - always resolve ours
2b7830d SVN_SILENT made messages (.desktop file) - always resolve ours
ac4c2d7 GIT_SILENT Ignore result of KReportRendererBase::render call
a91c14c SVN_SILENT made messages (.desktop file) - always resolve ours
d772626 SVN_SILENT made messages (.desktop file) - always resolve ours
e695dad Fix minor build errrors
5abc07d Implement T4492 by performing some simple api cleanups/renames
4f04ab9 Improve HeadersTest
e6a0696 Include KDECompilerSettings and KDEFrameworkCompilerSettings with NO_POLICY_SCOPE as recommended
9f1a380 Fix usage of QPageLayout by calling the non default constructor
0247d13 Update for the new KProperty::setValueSyncPolicy API 3.1
b2ed5c9 Merge branch '3.0'
5dadf63 Fix SortedField to not cause crashes when default copy-ctr is used
e22c39c GIT_SILENT typos--
e1cdb13 Fix build warnings and clear up init() code for items
b7ee4ca Fixes for issues picked up by coverity
dabf54a TRIVIAL: fix copyright
57337f3 TRIVIAL: Remove unnecessary funcions
2014741 SVN_SILENT made messages (.desktop file) - always resolve ours
362b144 Address T4491 making KReportDpi a private non-exported class
d6f58b6 Squashed commit of the following: TRIVIAL
fbac3ff Add dtpr to KReportUnit
649cf74 Squashed commit of the following: TRIVIAL
2209f06 Add dptr to KReportData and SortedField
5cd610c SVN_SILENT made messages (.desktop file) - always resolve ours
77732e2 Add dptr to classes in KReportRendererBase.h
3ae612d Add dptr to KReportScriptHandler
d3dbe75 ZoomHandler and ZoomMode do not need to be exported
3e31807 Merge branch '3.0'
4e7e49c Remove KReportPosition and KReportSize.  Port the Line item to QPointF and KProperty.
1b554d8 Improve ORODocument
1cc2c69 Update KReportAddQCH.cmake to latest state of ECMAddQCH.cmake
0f19996 SVN_SILENT made messages (.desktop file) - always resolve ours
7457dd4 SVN_SILENT made messages (.desktop file) - always resolve ours
cde955a Remove outdated TODO
1dc3c3e New: KReportAddQCH.cmake for creating an API dox QCH file during the build
fc47bb2 SVN_SILENT made messages (.desktop file) - always resolve ours
0ee5572 Remove KReportPageOptions
4e8e428 TRIVIAL: Fix infinite recursion in KReportItemBase
138351e Add d-ptr to kReportItemBase and port KReportItemLine
a61409a Merge branch '3.0'
e72a392 Merge branch '3.0'
3b49cc9 Add Q_DECL_HIDDEN to all nested Private classes
8c7b5ca Merge branch '3.0'
70e8ba0 SVN_SILENT made messages (.desktop file) - always resolve ours
fa27e2c Merge branch '3.0'
112da86 TRIVIAL: Synchronize plugin versions with KReport version: 3.1
2e6834f SVN_SILENT made messages (.desktop file) - always resolve ours
6ee33e7 Merge branch '3.0'
c4aee62 Merge branch '3.0'
acab6a3 TRIVIAL Specify KF as requered component of KPropertyWidgets (possible since 3.1)
83e154b Port KReportDocument to use a d-pointer
d72140e Fix async rendering of map item
761c9c6 SVN_SILENT made messages (.desktop file) - always resolve ours
502bdda Merge branch '3.0'
117fa2a Merge remote-tracking branch 'origin/3.0'
77ad82f Add 24x24 icons, useful on classic Windows
273a341 macro kproperty_add_icons_rcc_file: generate rcc icons in the builddir/bin/data/icons/ dir so it can be used within the builddir
00709ab GIT_SILENT Version 3.1 alpha, depend on KProperty 3.1 alpha
e5d5b81 SVN_SILENT made messages (.desktop file) - always resolve ours
086234f Fix icon name to kreport-web-element
ec22af6 GIT_SILENT Add another json file to the project's list
637c8d7 Version 3.0.0, depend on KProperty 3.0.0
f5d4741 Make KReport use resource files for icons
dfc3cad Initial port of web plugin to Qt5/KReport3/QtWebEngine
96ab741 Fix navigation

Switched to branch fix_group_dlg. Identifying and merging...
Usage Exception: There are multiple revisions on feature branch 'fix_group_dlg' which are not present on '3.0':

     - D5948: Port the Group dialog widget.  Was missed from the Qt5 porting.
     - D5894: Add and improve user scripting api docs from 2.9
     - D5875: Add missing features from 2.9
     - D5700: Possible fix for T668
     - D5629: Modernize the code: use override and nullptr
     - D5437: Rename KRTextStyleData to KReportTextStyleData
     - D5418: Remove unnescessary strings for translation
     - D5404: Linestyle improvements from 3.0
     - D5120: API: Make KReportDesignerSection constructed by KReportDesigner, hide the zoom handler, use more stack, some renames
     - D3891: Fix build warnings and clear up init() code for items
     - D2889: Port QRegExp to QRegularExpression in KReport
     - D4230: Implement T4492 by performing some simple api cleanups/renames
     - D4021: Fix usage of QPageLayout by calling the non default constructor
     - D4047: Update for the new KProperty::setValueSyncPolicy API 3.1
     - D4005: Fix SortedField to not cause crashes when default copy-ctr is used
     - D3827: Fixes for issues picked up by coverity
     - D3800: Address T4491 making KReportDpi a private non-exported class
     - D3757: Add dptr to KReportData and SortedField
     - D3792: Add dtpr to KReportUnit
     - D3746: Add dptr to classes in KReportRendererBase.h
     - D3741: Add dptr to KReportScriptHandler
     - D3423: Improve ORODocument
     - D3612: Remove KReportPosition and KReportSize.  Port the Line item to QPointF and KProperty.
     - D3515: New: KReportAddQCH.cmake for creating an API dox QCH file during the build
     - D3322: Remove KReportPageOptions
     - D3286: Add d-ptr to kReportItemBase and port KReportItemLine
     - D3043: Port KReportDocument to use a d-pointer
     - D3028: Fix async rendering of map item
     - D2860: Make KReport use resource files for icons
     - D2863: Initial port of web plugin to Qt5/KReport3/QtWebEngine

Separate these revisions onto different branchs, or use --revision <id>' to use the commit message from <id> and land them all.