aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
4 files changed, 29 insertions, 8 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 08:42:10 +0000