aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/quick/imageelements/CMakeLists.txt5
-rw-r--r--examples/quick/scenegraph/rendernode/CMakeLists.txt27
-rw-r--r--src/particles/CMakeLists.txt10
-rw-r--r--src/qml/.prev_CMakeLists.txt13
-rw-r--r--src/qml/CMakeLists.txt13
-rw-r--r--src/quick/CMakeLists.txt1
-rw-r--r--tests/auto/qml/qmllint/CMakeLists.txt32
-rw-r--r--tests/auto/qml/qqmllanguage/CMakeLists.txt25
-rw-r--r--tests/auto/qml/qqmlpropertymap/CMakeLists.txt14
9 files changed, 107 insertions, 33 deletions
diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt
index 5e233983aa..2f4f5ad00d 100644
--- a/examples/quick/imageelements/CMakeLists.txt
+++ b/examples/quick/imageelements/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/quick/imageelements")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -42,11 +42,14 @@ set(imageelements_resource_files
"content/colors-round.sci"
"content/colors-stretch.sci"
"content/colors.png"
+ "content/multi.ico"
"content/qt-logo.png"
"content/shadow.png"
"content/speaker.png"
+ "framestepping.qml"
"image.qml"
"imageelements.qml"
+ "multiframeborderimage.qml"
"shadows.qml"
"spritesequence.qml"
)
diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt
index 40d2c20849..9f0ad7da52 100644
--- a/examples/quick/scenegraph/rendernode/CMakeLists.txt
+++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/rendernode")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -32,6 +32,8 @@ target_link_libraries(rendernode PUBLIC
# Resources:
set(rendernode_resource_files
"main.qml"
+ "metalshader.frag"
+ "metalshader.vert"
"shader_frag.cso"
"shader_vert.cso"
)
@@ -44,6 +46,29 @@ qt6_add_resources(rendernode "rendernode"
)
+if(QT_FEATURE_d3d12)
+ target_sources(rendernode PUBLIC
+ d3d12renderer.cpp d3d12renderer.h
+ )
+
+ target_link_libraries(rendernode PUBLIC
+ d3d12
+ )
+
+endif()
+
+if(APPLE_OSX)
+ target_sources(rendernode PUBLIC
+ metalrenderer.h metalrenderer.mm
+ )
+
+ target_link_libraries(rendernode PUBLIC
+ "-framework AppKit"
+ "-framework Metal"
+ )
+
+endif()
+
install(TARGETS rendernode
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 83e694d2df..dac7705233 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -77,6 +77,16 @@ set(particles1_resource_files
"shaders/imageparticle.vert"
"shaders/imageparticle_core.frag"
"shaders/imageparticle_core.vert"
+ "shaders_ng/imageparticle_colored.frag.qsb"
+ "shaders_ng/imageparticle_colored.vert.qsb"
+ "shaders_ng/imageparticle_deformed.frag.qsb"
+ "shaders_ng/imageparticle_deformed.vert.qsb"
+ "shaders_ng/imageparticle_simple.frag.qsb"
+ "shaders_ng/imageparticle_simple.vert.qsb"
+ "shaders_ng/imageparticle_sprite.frag.qsb"
+ "shaders_ng/imageparticle_sprite.vert.qsb"
+ "shaders_ng/imageparticle_tabled.frag.qsb"
+ "shaders_ng/imageparticle_tabled.vert.qsb"
)
add_qt_resource(QuickParticles "particles1"
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index bbe31482e4..222e2a622b 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -503,6 +503,11 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
qml/qqmllocale.cpp qml/qqmllocale_p.h
)
+extend_target(Qml CONDITION ANDROID
+ DEFINES
+ LIBS_SUFFIX='\\"_.so\\"'
+)
+
extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
LIBRARIES
rt
@@ -548,7 +553,7 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
-Wno-expansion-to-defined
)
-#### Keys ignored in scope 64:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
+#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
extend_target(Qml CONDITION WINRT
@@ -577,7 +582,7 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
)
-#### Keys ignored in scope 72:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
+#### Keys ignored in scope 73:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
# ITAB = "$$PWD/disassembler/udis86/optable.xml"
# QMAKE_EXTRA_COMPILERS = "udis86"
# QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
@@ -588,10 +593,10 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
# udis86_tab_cfile.depends = "udis86_itab.h"
# udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c"
-#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
# GENERATEDDIR = "$$GENERATEDDIR/debug"
-#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
+#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
# GENERATEDDIR = "$$GENERATEDDIR/release"
extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index cae2a55e41..860eb242e3 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -512,6 +512,11 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
qml/qqmllocale.cpp qml/qqmllocale_p.h
)
+extend_target(Qml CONDITION ANDROID
+ DEFINES
+ LIBS_SUFFIX='\\"_.so\\"'
+)
+
extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
LIBRARIES
rt
@@ -557,7 +562,7 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
-Wno-expansion-to-defined
)
-#### Keys ignored in scope 64:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
+#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
extend_target(Qml CONDITION WINRT
@@ -586,7 +591,7 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
)
-#### Keys ignored in scope 72:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
+#### Keys ignored in scope 73:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
# ITAB = "$$PWD/disassembler/udis86/optable.xml"
# QMAKE_EXTRA_COMPILERS = "udis86"
# QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
@@ -597,10 +602,10 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
# udis86_tab_cfile.depends = "udis86_itab.h"
# udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c"
-#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
# GENERATEDDIR = "$$GENERATEDDIR/debug"
-#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
+#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
# GENERATEDDIR = "$$GENERATEDDIR/release"
extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index dd04fa598c..06051a2fbc 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -123,6 +123,7 @@ add_qt_module(Quick
scenegraph/util/qsgninepatchnode.cpp scenegraph/util/qsgninepatchnode.h
scenegraph/util/qsgplaintexture.cpp scenegraph/util/qsgplaintexture_p.h
scenegraph/util/qsgrectanglenode.cpp scenegraph/util/qsgrectanglenode.h
+ scenegraph/util/qsgrhinativetextureimporter.cpp scenegraph/util/qsgrhinativetextureimporter_p.h
scenegraph/util/qsgsimplematerial.cpp scenegraph/util/qsgsimplematerial.h
scenegraph/util/qsgsimplerectnode.cpp scenegraph/util/qsgsimplerectnode.h
scenegraph/util/qsgsimpletexturenode.cpp scenegraph/util/qsgsimpletexturenode.h
diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a9995910ae..a4bc65a0da 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -1,19 +1,35 @@
# Generated from qmllint.pro.
#####################################################################
-## testqmllint Binary:
+## tst_qmllint Test:
#####################################################################
-add_qt_executable(testqmllint
- GUI
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ data/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmllint
SOURCES
- main.cpp
+ ../../shared/util.cpp ../../shared/util.h
+ tst_qmllint.cpp
INCLUDE_DIRECTORIES
- .
+ ../../shared
PUBLIC_LIBRARIES
Qt::Gui
- Qt::Test
+ TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
+ DEFINES
+ QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
-# TEMPLATE = "app"
+extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
+ DEFINES
+ QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index 86958dfc81..9ed977bddc 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -5,15 +5,12 @@
#####################################################################
# Collect test data
-
-file(GLOB test_data_glob
- LIST_DIRECTORIES true
+file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
- "data/*")
+ data/*)
list(APPEND test_data ${test_data_glob})
add_qt_test(tst_qqmllanguage
- GUI
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -33,14 +30,26 @@ add_qt_test(tst_qqmllanguage
)
#### Keys ignored in scope 1:.:.:qqmllanguage.pro:<TRUE>:
-# CONFIG = "testcase"
# OTHER_FILES = "data/readonlyObjectProperty.qml"
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:qqmllanguage.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
+# Resources:
+set_source_files_properties("data/I18nType30.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "data/I18nTypeÁâãäå.qml"
+)
+set(qqmllanguage_resource_files
+ "data/I18nType30.qml"
+)
+
+add_qt_resource(tst_qqmllanguage "qqmllanguage"
+ PREFIX
+ "/"
+ FILES
+ ${qqmllanguage_resource_files}
+)
+
extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
DEFINES
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index fc7da3df75..2daf727a5c 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -4,8 +4,13 @@
## tst_qqmlpropertymap Test:
#####################################################################
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ data/*)
+list(APPEND test_data ${test_data_glob})
+
add_qt_test(tst_qqmlpropertymap
- GUI
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlpropertymap.cpp
@@ -20,17 +25,12 @@ add_qt_test(tst_qqmlpropertymap
Qt::Gui
Qt::Qml
Qt::Quick
+ TESTDATA ${test_data}
)
-#### Keys ignored in scope 1:.:.:qqmlpropertymap.pro:<TRUE>:
-# CONFIG = "testcase"
-
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:qqmlpropertymap.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:18:36 +0000