summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-11 19:17:10 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-12 13:16:08 +0000
commite6a845ad88d0638a43c526f0de4115d9546b00a2 (patch)
treef058c7d0c4a1748a6c3062798364e12c0d30e805
parenta0967c2a4f171e9edf6edef0c2ea966500343563 (diff)
Regenerate a bunch of projects after pro2cmake changes
Change-Id: I675a068411785364915a074ca0e631fec944d228 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/corelib/.prev_CMakeLists.txt4
-rw-r--r--src/corelib/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt27
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt25
-rw-r--r--src/plugins/platforms/windows/.prev_CMakeLists.txt65
-rw-r--r--src/plugins/platforms/windows/CMakeLists.txt65
-rw-r--r--src/printsupport/CMakeLists.txt4
-rw-r--r--src/tools/moc/.prev_CMakeLists.txt2
-rw-r--r--src/tools/moc/CMakeLists.txt3
-rw-r--r--src/tools/qdbuscpp2xml/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qdbuscpp2xml/CMakeLists.txt2
-rw-r--r--src/widgets/.prev_CMakeLists.txt2
-rw-r--r--src/widgets/CMakeLists.txt2
13 files changed, 106 insertions, 98 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index dd11847011..74f2d631e1 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -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"
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 82e05c690d..0720b3abf6 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -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:
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 79496058e3..a47c1b0527 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -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
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 26784ca291..8a3c77a5ac 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -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
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
index c5ea83e470..05c9d7c3ed 100644
--- a/src/plugins/platforms/windows/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -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
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 18764124e4..ba90c88ece 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -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
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 5cdd16aa90..f3e02bfdcf 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -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"
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index f850ec17fa..a10e33f7ba 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -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
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 8ba5fc0a83..973bf6ec93 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -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
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index ecb45e4416..da1e439974 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -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
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 3bf127c0f1..b1171c9dd7 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -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
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index cdd9546eda..c7fc2b7fb5 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -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"
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 4fb69ee475..7609997b5c 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -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"