summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 17:16:46 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-23 02:17:03 +0200
commit1a46fba0b93582adc38f13cbeb5759445d8a6670 (patch)
treee21af0c31ded163691e3aa133786906a4f49edbc
parentc1d89d3365174d4ad54fcca1019df189fe53b87a (diff)
CMake: Regenerate projects before API change
Task-number: QTBUG-86815 Change-Id: Ie06af33cee62d1742fabc4b992e6bc5a68fcc6a1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--.cmake.conf1
-rw-r--r--.prev_CMakeLists.txt3
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/plugins/imageformats/icns/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/jp2/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/macheif/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/macheif/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/macjp2/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/mng/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/tga/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/tiff/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/tiff/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/wbmp/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/webp/CMakeLists.txt2
14 files changed, 16 insertions, 13 deletions
diff --git a/.cmake.conf b/.cmake.conf
new file mode 100644
index 0000000..9305480
--- /dev/null
+++ b/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.0.0")
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index cb76c1f..298c008 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -2,8 +2,9 @@
cmake_minimum_required(VERSION 3.15.0)
+include(.cmake.conf)
project(imageformats_FIXME
- VERSION 6.0.0
+ VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt imageformats_FIXME Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 961585c..f68a3e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,9 @@
cmake_minimum_required(VERSION 3.15.0)
+include(.cmake.conf)
project(QtImageFormats # special case
- VERSION 6.0.0
+ VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt ImageFormats Libraries" # special case
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt
index 715e544..8f6f306 100644
--- a/src/plugins/imageformats/icns/CMakeLists.txt
+++ b/src/plugins/imageformats/icns/CMakeLists.txt
@@ -4,7 +4,7 @@
## QICNSPlugin Plugin:
#####################################################################
-qt_add_plugin(QICNSPlugin
+qt_internal_add_plugin(QICNSPlugin
OUTPUT_NAME qicns
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/jp2/CMakeLists.txt b/src/plugins/imageformats/jp2/CMakeLists.txt
index 7afc730..5b594e1 100644
--- a/src/plugins/imageformats/jp2/CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/CMakeLists.txt
@@ -4,7 +4,7 @@
## QJp2Plugin Plugin:
#####################################################################
-qt_add_plugin(QJp2Plugin
+qt_internal_add_plugin(QJp2Plugin
OUTPUT_NAME qjp2
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
index 9618984..6c624b2 100644
--- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QMacHeifPlugin Plugin:
#####################################################################
-qt_add_plugin(QMacHeifPlugin
+qt_internal_add_plugin(QMacHeifPlugin
OUTPUT_NAME qmacheif
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt
index 7d90b40..cff3bd3 100644
--- a/src/plugins/imageformats/macheif/CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/CMakeLists.txt
@@ -10,7 +10,7 @@ find_library(FWCoreGraphics CoreGraphics)
find_library(FWImageIO ImageIO)
# special case end
-qt_add_plugin(QMacHeifPlugin
+qt_internal_add_plugin(QMacHeifPlugin
OUTPUT_NAME qmacheif
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt
index 94d5ab3..f7f73a5 100644
--- a/src/plugins/imageformats/macjp2/CMakeLists.txt
+++ b/src/plugins/imageformats/macjp2/CMakeLists.txt
@@ -4,7 +4,7 @@
## QMacJp2Plugin Plugin:
#####################################################################
-qt_add_plugin(QMacJp2Plugin
+qt_internal_add_plugin(QMacJp2Plugin
OUTPUT_NAME qmacjp2
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt
index 185f602..9b64cb7 100644
--- a/src/plugins/imageformats/mng/CMakeLists.txt
+++ b/src/plugins/imageformats/mng/CMakeLists.txt
@@ -4,7 +4,7 @@
## QMngPlugin Plugin:
#####################################################################
-qt_add_plugin(QMngPlugin
+qt_internal_add_plugin(QMngPlugin
OUTPUT_NAME qmng
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt
index db1def3..7a4d4e5 100644
--- a/src/plugins/imageformats/tga/CMakeLists.txt
+++ b/src/plugins/imageformats/tga/CMakeLists.txt
@@ -4,7 +4,7 @@
## QTgaPlugin Plugin:
#####################################################################
-qt_add_plugin(QTgaPlugin
+qt_internal_add_plugin(QTgaPlugin
OUTPUT_NAME qtga
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
index 3ac1280..af83b32 100644
--- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QTiffPlugin Plugin:
#####################################################################
-qt_add_plugin(QTiffPlugin
+qt_internal_add_plugin(QTiffPlugin
OUTPUT_NAME qtiff
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt
index c9a7f56..8cd8585 100644
--- a/src/plugins/imageformats/tiff/CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/CMakeLists.txt
@@ -13,7 +13,7 @@ elseif(NOT TARGET ZLIB::ZLIB)
endif()
# special case end
-qt_add_plugin(QTiffPlugin
+qt_internal_add_plugin(QTiffPlugin
OUTPUT_NAME qtiff
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt
index 2d6484a..95cdcd8 100644
--- a/src/plugins/imageformats/wbmp/CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/CMakeLists.txt
@@ -4,7 +4,7 @@
## QWbmpPlugin Plugin:
#####################################################################
-qt_add_plugin(QWbmpPlugin
+qt_internal_add_plugin(QWbmpPlugin
OUTPUT_NAME qwbmp
TYPE imageformats
SOURCES
diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt
index b1edce6..b2613ae 100644
--- a/src/plugins/imageformats/webp/CMakeLists.txt
+++ b/src/plugins/imageformats/webp/CMakeLists.txt
@@ -4,7 +4,7 @@
## QWebpPlugin Plugin:
#####################################################################
-qt_add_plugin(QWebpPlugin
+qt_internal_add_plugin(QWebpPlugin
OUTPUT_NAME qwebp
TYPE imageformats
SOURCES