1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate a bunch of projects after pro2cmake changes

Browse Source 
Change-Id: I675a068411785364915a074ca0e631fec944d228
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-11-11 19:17:10 +01:00
parent a0967c2a4f
commit e6a845ad88
13 changed files with 103 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/.prev_CMakeLists.txt
View File

@ -431,7 +431,7 @@ extend_target(Core CONDITION INTEGRITY
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
# f16c_cxx = "false"
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND TEST_architecture_arch STREQUAL x86imdAlways:
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
# f16c_cxx = "true"
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
@ -1024,7 +1024,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
set(mimetypes_resource_files
"mime/packages/freedesktop.org.xml"
)
add_qt_resource(Core "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"

2
src/corelib/CMakeLists.txt
View File

@ -514,7 +514,7 @@ extend_target(Core CONDITION INTEGRITY
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
# f16c_cxx = "false"
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND TEST_architecture_arch STREQUAL x86imdAlways:
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
# f16c_cxx = "true"
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:

25
src/plugins/platforms/eglfs/.prev_CMakeLists.txt
View File

@ -72,19 +72,20 @@ extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEM
EGLFS_PREFERRED_PLUGIN=
)
# Resources:
set(cursor_resource_files
"cursor-atlas.png"
"cursor.json"
)
add_qt_resource(EglFSDeviceIntegration "cursor"
PREFIX
"/"
FILES
${cursor_resource_files}
)
if(NOT DEFINES___contains___QT_NO_CURSOR)
# Resources:
set(cursor_resource_files
"cursor-atlas.png"
"cursor.json"
)
add_qt_resource(EglFSDeviceIntegration "cursor"
PREFIX
"/"
FILES
${cursor_resource_files}
)
endif()
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES

25
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -58,19 +58,20 @@ extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupp
# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ...
# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ...
# Resources:
set(cursor_resource_files
"cursor-atlas.png"
"cursor.json"
)
add_qt_resource(EglFSDeviceIntegration "cursor"
PREFIX
"/"
FILES
${cursor_resource_files}
)
if(QT_FEATURE_cursor) # special case
# Resources:
set(cursor_resource_files
"cursor-atlas.png"
"cursor.json"
)
add_qt_resource(EglFSDeviceIntegration "cursor"
PREFIX
"/"
FILES
${cursor_resource_files}
)
endif()
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES

63
src/plugins/platforms/windows/.prev_CMakeLists.txt
View File

@ -185,38 +185,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
qwindowssessionmanager.cpp qwindowssessionmanager.h
)
# Resources:
set(cursors_resource_files
"images/closedhandcursor_32.png"
"images/closedhandcursor_48.png"
"images/closedhandcursor_64.png"
"images/dragcopycursor_32.png"
"images/dragcopycursor_48.png"
"images/dragcopycursor_64.png"
"images/draglinkcursor_32.png"
"images/draglinkcursor_48.png"
"images/draglinkcursor_64.png"
"images/dragmovecursor_32.png"
"images/dragmovecursor_48.png"
"images/dragmovecursor_64.png"
"images/openhandcursor_32.png"
"images/openhandcursor_48.png"
"images/openhandcursor_64.png"
"images/splithcursor_32.png"
"images/splithcursor_48.png"
"images/splithcursor_64.png"
"images/splitvcursor_32.png"
"images/splitvcursor_48.png"
"images/splitvcursor_64.png"
)
add_qt_resource(qwindows "cursors"
PREFIX
"/qt-project.org/windows/cursors"
FILES
${cursors_resource_files}
)
if(QT_FEATURE_imageformat_png)
# Resources:
set(cursors_resource_files
"images/closedhandcursor_32.png"
"images/closedhandcursor_48.png"
"images/closedhandcursor_64.png"
"images/dragcopycursor_32.png"
"images/dragcopycursor_48.png"
"images/dragcopycursor_64.png"
"images/draglinkcursor_32.png"
"images/draglinkcursor_48.png"
"images/draglinkcursor_64.png"
"images/dragmovecursor_32.png"
"images/dragmovecursor_48.png"
"images/dragmovecursor_64.png"
"images/openhandcursor_32.png"
"images/openhandcursor_48.png"
"images/openhandcursor_64.png"
"images/splithcursor_32.png"
"images/splithcursor_48.png"
"images/splithcursor_64.png"
"images/splitvcursor_32.png"
"images/splitvcursor_48.png"
"images/splitvcursor_64.png"
)
add_qt_resource(qwindows "cursors"
PREFIX
"/qt-project.org/windows/cursors"
FILES
${cursors_resource_files}
)
endif()
extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
LIBRARIES

63
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -186,38 +186,39 @@ extend_target(qwindows CONDITION QT_FEATURE_sessionmanager
qwindowssessionmanager.cpp qwindowssessionmanager.h
)
# Resources:
set(cursors_resource_files
"images/closedhandcursor_32.png"
"images/closedhandcursor_48.png"
"images/closedhandcursor_64.png"
"images/dragcopycursor_32.png"
"images/dragcopycursor_48.png"
"images/dragcopycursor_64.png"
"images/draglinkcursor_32.png"
"images/draglinkcursor_48.png"
"images/draglinkcursor_64.png"
"images/dragmovecursor_32.png"
"images/dragmovecursor_48.png"
"images/dragmovecursor_64.png"
"images/openhandcursor_32.png"
"images/openhandcursor_48.png"
"images/openhandcursor_64.png"
"images/splithcursor_32.png"
"images/splithcursor_48.png"
"images/splithcursor_64.png"
"images/splitvcursor_32.png"
"images/splitvcursor_48.png"
"images/splitvcursor_64.png"
)
add_qt_resource(qwindows "cursors"
PREFIX
"/qt-project.org/windows/cursors"
FILES
${cursors_resource_files}
)
if(QT_FEATURE_imageformat_png)
# Resources:
set(cursors_resource_files
"images/closedhandcursor_32.png"
"images/closedhandcursor_48.png"
"images/closedhandcursor_64.png"
"images/dragcopycursor_32.png"
"images/dragcopycursor_48.png"
"images/dragcopycursor_64.png"
"images/draglinkcursor_32.png"
"images/draglinkcursor_48.png"
"images/draglinkcursor_64.png"
"images/dragmovecursor_32.png"
"images/dragmovecursor_48.png"
"images/dragmovecursor_64.png"
"images/openhandcursor_32.png"
"images/openhandcursor_48.png"
"images/openhandcursor_64.png"
"images/splithcursor_32.png"
"images/splithcursor_48.png"
"images/splithcursor_64.png"
"images/splitvcursor_32.png"
"images/splitvcursor_48.png"
"images/splitvcursor_64.png"
)
add_qt_resource(qwindows "cursors"
PREFIX
"/qt-project.org/windows/cursors"
FILES
${cursors_resource_files}
)
endif()
extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
LIBRARIES

4
src/printsupport/CMakeLists.txt
View File

@ -116,7 +116,7 @@ if(QT_FEATURE_printdialog)
"images/zoom-out-24.png"
"images/zoom-out-32.png"
)
add_qt_resource(PrintSupport "qprintdialog"
PREFIX
"/qt-project.org/dialogs/qprintpreviewdialog"
@ -129,7 +129,7 @@ if(QT_FEATURE_printdialog)
"images/status-color.png"
"images/status-gray-scale.png"
)
add_qt_resource(PrintSupport "qprintdialog1"
PREFIX
"/qt-project.org/dialogs/qprintdialog"

2
src/tools/moc/.prev_CMakeLists.txt
View File

@ -10,10 +10,12 @@ add_qt_tool(moc
cbordevice.h
collectjson.cpp collectjson.h
generator.cpp generator.h
main.cpp
moc.cpp moc.h
outputrevision.h
parser.cpp parser.h
preprocessor.cpp preprocessor.h
qdatetime_p.h
symbols.h
token.cpp token.h
utils.h

3
src/tools/moc/CMakeLists.txt
View File

@ -11,11 +11,12 @@ add_qt_tool(moc
cbordevice.h
collectjson.cpp collectjson.h
generator.cpp generator.h
main.cpp # special case
main.cpp
moc.cpp moc.h
outputrevision.h
parser.cpp parser.h
preprocessor.cpp preprocessor.h
# qdatetime_p.h special case remove
symbols.h
token.cpp token.h
utils.h

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

@ -16,6 +16,7 @@ add_qt_tool(qdbuscpp2xml
../moc/symbols.h
../moc/token.cpp ../moc/token.h
../moc/utils.h
qdbuscpp2xml.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_FOREACH

2
src/tools/qdbuscpp2xml/CMakeLists.txt
View File

@ -17,7 +17,7 @@ add_qt_tool(qdbuscpp2xml
../moc/symbols.h
../moc/token.cpp ../moc/token.h
../moc/utils.h
qdbuscpp2xml.cpp # special case
qdbuscpp2xml.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_FOREACH

2
src/widgets/.prev_CMakeLists.txt
View File

@ -652,7 +652,7 @@ if(QT_FEATURE_messagebox)
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"

2
src/widgets/CMakeLists.txt
View File

@ -656,7 +656,7 @@ if(QT_FEATURE_messagebox)
set(qmessagebox_resource_files
"images/qtlogo-64.png"
)
add_qt_resource(Widgets "qmessagebox"
PREFIX
"/qt-project.org/qmessagebox"