diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-04 22:57:36 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 07:39:14 +0000 |
| commit | 891c897b801c86eaf4c4daea5fab3f2d510fbbe8 (patch) | |
| tree | fd40443526e11f262b18334fda69d6fb6b5d0d5b /src/widgets | |
| parent | 9231204e2ccab611af0df9a18761cd601ba20e92 (diff) | |
Regenerate the main qtbase modules
There were some changes done in pro2cmake, so regenerate the main
qtbase modules to keep everything up to date.
Some new whitespace got added.
Some special cases were removed (ZLIB).
Some opengl code got moved around.
Some plugin types were added.
And some other minor things.
Change-Id: Ie8cba4a9aa6b4b163c39d6cf546ea9e0bfc05c01
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/widgets/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 6d4691d8f8..f8ae83025c 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_module(Widgets QMAKE_MODULE_CONFIG uic + PLUGIN_TYPES styles SOURCES itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -796,3 +797,4 @@ qt_create_tracepoints(Widgets qtwidgets.tracepoints) add_qt_docs( doc/qtwidgets.qdocconf ) + diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 5532f7387d..a4c4ea16a3 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_module(Widgets QMAKE_MODULE_CONFIG uic + PLUGIN_TYPES styles SOURCES itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -800,3 +801,4 @@ qt_create_tracepoints(Widgets qtwidgets.tracepoints) add_qt_docs( doc/qtwidgets.qdocconf ) + |