whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-generate affected cmake files and configure.json after the merge 

This also removes the workarounds of commit
b2662b05dd now that it's fixed "upstream"
in the .pro files.

Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Simon Hausmann 2019-10-17 10:02:48 +02:00
parent 02164e0288
commit 4df389eb4f
19 changed files with 182 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/corelib/.prev_CMakeLists.txt
View File

@ -121,7 +121,6 @@ add_qt_module(Core
serialization/qcborcommon.h
serialization/qcbordiagnostic.cpp
serialization/qcbormap.h
serialization/qcborstream.cpp serialization/qcborstream.h
serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
serialization/qjson.cpp serialization/qjson_p.h
@ -364,6 +363,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT
io/qwindowspipereader.cpp io/qwindowspipereader_p.h
io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
kernel/qwinregistry.cpp kernel/qwinregistry_p.h
LIBRARIES
advapi32
kernel32
@ -995,6 +995,11 @@ extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_i
codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
)
extend_target(Core CONDITION QT_FEATURE_cborstream
SOURCES
serialization/qcborstream.cpp serialization/qcborstream.h
)
extend_target(Core CONDITION QT_FEATURE_qeventtransition
SOURCES
statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
@ -1011,23 +1016,24 @@ extend_target(Core CONDITION QT_FEATURE_mimetype
mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
)
# Resources:
set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
add_qt_resource(Core "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"mimetypes"
FILES
${mimetypes_resource_files}
)
if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
# Resources:
set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
add_qt_resource(Core "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"mimetypes"
FILES
${mimetypes_resource_files}
)
endif()
extend_target(Core CONDITION WASM
SOURCES

13
src/corelib/CMakeLists.txt
View File

@ -135,7 +135,6 @@ add_qt_module(Core
serialization/qcborcommon.h
serialization/qcbordiagnostic.cpp
serialization/qcbormap.h
serialization/qcborstream.cpp serialization/qcborstream.h
serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
serialization/qjson.cpp serialization/qjson_p.h
@ -447,6 +446,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT
io/qwindowspipereader.cpp io/qwindowspipereader_p.h
io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
kernel/qwinregistry.cpp kernel/qwinregistry_p.h
LIBRARIES
advapi32
kernel32
@ -1071,6 +1071,11 @@ extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_i
codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
)
extend_target(Core CONDITION QT_FEATURE_cborstream
SOURCES
serialization/qcborstream.cpp serialization/qcborstream.h
)
extend_target(Core CONDITION QT_FEATURE_qeventtransition
SOURCES
statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
@ -1092,8 +1097,10 @@ extend_target(Core CONDITION QT_FEATURE_mimetype
# We can't specify the resources directly as we have unit tests that
# depend on these as well and we no longer support the use of hand
# edited qrc files.
include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
corelib_add_mimetypes_resources(Core)
if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
corelib_add_mimetypes_resources(Core)
endif()
# special case end
extend_target(Core CONDITION WASM

5
src/corelib/configure.cmake
View File

@ -906,3 +906,8 @@ qt_feature("win32_system_libs"
LABEL "Windows System Libraries"
CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
)
qt_feature("cborstream" PUBLIC
SECTION "Utilities"
LABEL "CBOR stream I/O"
PURPOSE "Provides support for reading and writing the CBOR binary format. Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
)

2
src/network/.prev_CMakeLists.txt
View File

@ -26,10 +26,12 @@ add_qt_module(Network
access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
bearer/qbearerengine.cpp bearer/qbearerengine_p.h
bearer/qbearerengine_impl_p.h
bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
bearer/qnetworksession_impl.cpp bearer/qnetworksession_impl_p.h
bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h

2
src/network/CMakeLists.txt
View File

@ -26,10 +26,12 @@ add_qt_module(Network
access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
bearer/qbearerengine.cpp bearer/qbearerengine_p.h
bearer/qbearerengine_impl_p.h
bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
bearer/qnetworksession_impl.cpp bearer/qnetworksession_impl_p.h
bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h

2
src/plugins/bearer/android/src/CMakeLists.txt
View File

@ -8,8 +8,6 @@ add_qt_plugin(qandroidbearer
TYPE bearer
CLASS_NAME QAndroidBearerEnginePlugin
SOURCES
../../qbearerengine_impl.h
../../qnetworksession_impl.cpp ../../qnetworksession_impl.h
main.cpp
qandroidbearerengine.cpp qandroidbearerengine.h
wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h

25
src/plugins/bearer/connman/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,25 @@
# Generated from connman.pro.
#####################################################################
## qconnmanbearer Plugin:
#####################################################################
add_qt_plugin(qconnmanbearer
TYPE bearer
CLASS_NAME QConnmanEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h
LIBRARIES
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::Network
)
#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
# OTHER_FILES = "connman.json"
# _LOADED = "qt_plugin"

3
src/plugins/bearer/connman/CMakeLists.txt
View File

@ -6,12 +6,9 @@
add_qt_plugin(qconnmanbearer
TYPE bearer
DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QConnmanEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
../qbearerengine_impl.h
../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h

2
src/plugins/bearer/corewlan/CMakeLists.txt
View File

@ -8,8 +8,6 @@ add_qt_plugin(qcorewlanbearer
TYPE bearer
CLASS_NAME QCoreWlanEnginePlugin
SOURCES
../qbearerengine_impl.h
../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qcorewlanengine.h qcorewlanengine.mm
LIBRARIES

2
src/plugins/bearer/generic/CMakeLists.txt
View File

@ -9,8 +9,6 @@ add_qt_plugin(qgenericbearer
CLASS_NAME QGenericEnginePlugin
SOURCES
../platformdefs_win.h
../qbearerengine_impl.h
../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qgenericengine.cpp qgenericengine.h
LIBRARIES

25
src/plugins/bearer/networkmanager/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,25 @@
# Generated from networkmanager.pro.
#####################################################################
## qnmbearer Plugin:
#####################################################################
add_qt_plugin(qnmbearer
TYPE bearer
CLASS_NAME QNetworkManagerEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h
LIBRARIES
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::Network
)
#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
# OTHER_FILES = "networkmanager.json"
# _LOADED = "qt_plugin"

3
src/plugins/bearer/networkmanager/CMakeLists.txt
View File

@ -6,12 +6,9 @@
add_qt_plugin(qnmbearer
TYPE bearer
DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QNetworkManagerEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
../qbearerengine_impl.h
../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h

1
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -15,7 +15,6 @@ add_qt_plugin(qtforandroid
androidjniinput.cpp androidjniinput.h
androidjnimain.cpp androidjnimain.h
androidjnimenu.cpp androidjnimenu.h
androidplatformplugin.cpp
androidsurfaceclient.h
main.cpp
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h

1
src/plugins/platforms/android/CMakeLists.txt
View File

@ -16,7 +16,6 @@ add_qt_plugin(qtforandroid
androidjniinput.cpp androidjniinput.h
androidjnimain.cpp androidjnimain.h
androidjnimenu.cpp androidjnimenu.h
androidplatformplugin.cpp
androidsurfaceclient.h
main.cpp
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h

113
src/printsupport/CMakeLists.txt
View File

@ -82,62 +82,63 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog
uic
)
# Resources:
set(qprintdialog_resource_files
"images/fit-page-24.png"
"images/fit-page-32.png"
"images/fit-width-24.png"
"images/fit-width-32.png"
"images/go-first-24.png"
"images/go-first-32.png"
"images/go-last-24.png"
"images/go-last-32.png"
"images/go-next-24.png"
"images/go-next-32.png"
"images/go-previous-24.png"
"images/go-previous-32.png"
"images/layout-landscape-24.png"
"images/layout-landscape-32.png"
"images/layout-portrait-24.png"
"images/layout-portrait-32.png"
"images/page-setup-24.png"
"images/page-setup-32.png"
"images/print-24.png"
"images/print-32.png"
"images/view-page-multi-24.png"
"images/view-page-multi-32.png"
"images/view-page-one-24.png"
"images/view-page-one-32.png"
"images/view-page-sided-24.png"
"images/view-page-sided-32.png"
"images/zoom-in-24.png"
"images/zoom-in-32.png"
"images/zoom-out-24.png"
"images/zoom-out-32.png"
)
add_qt_resource(PrintSupport "qprintdialog"
PREFIX
"/qt-project.org/dialogs/qprintpreviewdialog"
BASE
"dialogs"
FILES
${qprintdialog_resource_files}
)
set(qprintdialog1_resource_files
"images/status-color.png"
"images/status-gray-scale.png"
)
add_qt_resource(PrintSupport "qprintdialog1"
PREFIX
"/qt-project.org/dialogs/qprintdialog"
BASE
"dialogs"
FILES
${qprintdialog1_resource_files}
)
if(QT_FEATURE_printdialog)
# Resources:
set(qprintdialog_resource_files
"images/fit-page-24.png"
"images/fit-page-32.png"
"images/fit-width-24.png"
"images/fit-width-32.png"
"images/go-first-24.png"
"images/go-first-32.png"
"images/go-last-24.png"
"images/go-last-32.png"
"images/go-next-24.png"
"images/go-next-32.png"
"images/go-previous-24.png"
"images/go-previous-32.png"
"images/layout-landscape-24.png"
"images/layout-landscape-32.png"
"images/layout-portrait-24.png"
"images/layout-portrait-32.png"
"images/page-setup-24.png"
"images/page-setup-32.png"
"images/print-24.png"
"images/print-32.png"
"images/view-page-multi-24.png"
"images/view-page-multi-32.png"
"images/view-page-one-24.png"
"images/view-page-one-32.png"
"images/view-page-sided-24.png"
"images/view-page-sided-32.png"
"images/zoom-in-24.png"
"images/zoom-in-32.png"
"images/zoom-out-24.png"
"images/zoom-out-32.png"
)
add_qt_resource(PrintSupport "qprintdialog"
PREFIX
"/qt-project.org/dialogs/qprintpreviewdialog"
BASE
"dialogs"
FILES
${qprintdialog_resource_files}
)
set(qprintdialog1_resource_files
"images/status-color.png"
"images/status-gray-scale.png"
)
add_qt_resource(PrintSupport "qprintdialog1"
PREFIX
"/qt-project.org/dialogs/qprintdialog"
BASE
"dialogs"
FILES
${qprintdialog1_resource_files}
)
endif()
extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog
SOURCES

1
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -142,6 +142,7 @@ extend_target(Bootstrap CONDITION WIN32
../../corelib/kernel/qcoreapplication_win.cpp
../../corelib/kernel/qsharedmemory_win.cpp
../../corelib/kernel/qsystemsemaphore_win.cpp
../../corelib/kernel/qwinregistry.cpp
../../corelib/plugin/qsystemlibrary.cpp
PUBLIC_LIBRARIES
advapi32

1
src/tools/bootstrap/CMakeLists.txt
View File

@ -147,6 +147,7 @@ extend_target(Bootstrap CONDITION WIN32
../../corelib/kernel/qcoreapplication_win.cpp
../../corelib/kernel/qsharedmemory_win.cpp
../../corelib/kernel/qsystemsemaphore_win.cpp
../../corelib/kernel/qwinregistry.cpp
../../corelib/plugin/qsystemlibrary.cpp
PUBLIC_LIBRARIES
advapi32

29
src/widgets/.prev_CMakeLists.txt
View File

@ -647,20 +647,21 @@ extend_target(Widgets CONDITION QT_FEATURE_messagebox
dialogs/qmessagebox.cpp dialogs/qmessagebox.h
)
# Resources:
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"
BASE
"dialogs"
FILES
${qmessagebox_resource_files}
)
if(QT_FEATURE_messagebox)
# Resources:
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"
BASE
"dialogs"
FILES
${qmessagebox_resource_files}
)
endif()
extend_target(Widgets CONDITION QT_FEATURE_progressdialog
SOURCES

29
src/widgets/CMakeLists.txt
View File

@ -651,20 +651,21 @@ extend_target(Widgets CONDITION QT_FEATURE_messagebox
dialogs/qmessagebox.cpp dialogs/qmessagebox.h
)
# Resources:
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"
BASE
"dialogs"
FILES
${qmessagebox_resource_files}
)
if(QT_FEATURE_messagebox)
# Resources:
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"
BASE
"dialogs"
FILES
${qmessagebox_resource_files}
)
endif()
extend_target(Widgets CONDITION QT_FEATURE_progressdialog
SOURCES