aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-08-09 13:09:20 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-08-09 11:48:37 +0000
commitf343e8e477ac27a5c59276bca63d0e199087fb87 (patch)
treea60aadde6b52a3d625376d54f7d17e8c60139009
parent82435af22634ce7fcd194ea56fc063a76bc66ec3 (diff)
Fix build after resent add_qml_module and add_qt_resource API changes
Re-generate the files. Change-Id: Iba8ab6f3701b8a5c8b26e34ce98845a8da22a9e4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/imports/calendar/CMakeLists.txt3
-rw-r--r--src/imports/controls/CMakeLists.txt5
-rw-r--r--src/imports/controls/fusion/CMakeLists.txt3
-rw-r--r--src/imports/controls/imagine/CMakeLists.txt3
-rw-r--r--src/imports/controls/material/CMakeLists.txt3
-rw-r--r--src/imports/controls/universal/CMakeLists.txt3
-rw-r--r--src/imports/platform/CMakeLists.txt1
-rw-r--r--src/imports/templates/CMakeLists.txt1
8 files changed, 0 insertions, 22 deletions
diff --git a/src/imports/calendar/CMakeLists.txt b/src/imports/calendar/CMakeLists.txt
index f3785c6f..c16a3113 100644
--- a/src/imports/calendar/CMakeLists.txt
+++ b/src/imports/calendar/CMakeLists.txt
@@ -8,7 +8,6 @@ add_qml_module(qtlabscalendarplugin
CPP_PLUGIN
URI "Qt.labs.calendar"
VERSION "1.0"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickcalendar.cpp qquickcalendar_p.h
qquickcalendarmodel.cpp qquickcalendarmodel_p.h
@@ -42,8 +41,6 @@ set(qml_files
)
add_qt_resource(qtlabscalendarplugin qmake_Qt_labs_calendar
- PREFIX
- "/qt-project.org/imports/Qt/labs/calendar"
FILES
${qml_files}
)
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
index fde7cfcf..5e8256cf 100644
--- a/src/imports/controls/CMakeLists.txt
+++ b/src/imports/controls/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquickcontrols2plugin
TARGET_PATH "QtQuick/Controls.2"
URI "QtQuick.Controls"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickdefaultbusyindicator.cpp qquickdefaultbusyindicator_p.h
qquickdefaultdial.cpp qquickdefaultdial_p.h
@@ -36,8 +35,6 @@ add_qml_module(qtquickcontrols2plugin
# Resources:
add_qt_resource(qtquickcontrols2plugin "qtquickcontrols2plugin"
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2"
FILES
images/arrow-indicator.png
images/arrow-indicator@2x.png
@@ -121,8 +118,6 @@ set(qml_files
)
add_qt_resource(qtquickcontrols2plugin qmake_QtQuick_Controls_2
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2"
FILES
${qml_files}
)
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt
index 3ae47268..3607f27c 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/imports/controls/fusion/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquickcontrols2fusionstyleplugin
TARGET_PATH "QtQuick/Controls.2/Fusion"
URI "QtQuick.Controls.Fusion"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
qquickfusiondial.cpp qquickfusiondial_p.h
@@ -110,8 +109,6 @@ set(qml_files
)
add_qt_resource(qtquickcontrols2fusionstyleplugin qmake_QtQuick_Controls_2_Fusion
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2/Fusion"
FILES
${qml_files}
)
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt
index 464510f9..bc89f88a 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/imports/controls/imagine/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquickcontrols2imaginestyleplugin
TARGET_PATH "QtQuick/Controls.2/Imagine"
URI "QtQuick.Controls.Imagine"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickimageselector.cpp qquickimageselector_p.h
qquickimaginestyle.cpp qquickimaginestyle_p.h
@@ -83,8 +82,6 @@ set(qml_files
)
add_qt_resource(qtquickcontrols2imaginestyleplugin qmake_QtQuick_Controls_2_Imagine
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2/Imagine"
FILES
${qml_files}
)
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index 1f1d8473..7f6f8a39 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquickcontrols2materialstyleplugin
TARGET_PATH "QtQuick/Controls.2/Material"
URI "QtQuick.Controls.Material"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
@@ -117,8 +116,6 @@ set(qml_files
)
add_qt_resource(qtquickcontrols2materialstyleplugin qmake_QtQuick_Controls_2_Material
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2/Material"
FILES
${qml_files}
)
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt
index 5b65d676..b9b66221 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/imports/controls/universal/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquickcontrols2universalstyleplugin
TARGET_PATH "QtQuick/Controls.2/Universal"
URI "QtQuick.Controls.Universal"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
@@ -112,8 +111,6 @@ set(qml_files
)
add_qt_resource(qtquickcontrols2universalstyleplugin qmake_QtQuick_Controls_2_Universal
- PREFIX
- "/qt-project.org/imports/QtQuick/Controls.2/Universal"
FILES
${qml_files}
)
diff --git a/src/imports/platform/CMakeLists.txt b/src/imports/platform/CMakeLists.txt
index 7e48083e..2a1e5205 100644
--- a/src/imports/platform/CMakeLists.txt
+++ b/src/imports/platform/CMakeLists.txt
@@ -8,7 +8,6 @@ add_qml_module(qtlabsplatformplugin
CPP_PLUGIN
URI "Qt.labs.platform"
VERSION "1.0"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qquickplatformcolordialog.cpp qquickplatformcolordialog_p.h
qquickplatformdialog.cpp qquickplatformdialog_p.h
diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt
index 8d94297b..fe91f792 100644
--- a/src/imports/templates/CMakeLists.txt
+++ b/src/imports/templates/CMakeLists.txt
@@ -9,7 +9,6 @@ add_qml_module(qtquicktemplates2plugin
TARGET_PATH "QtQuick/Templates.2"
URI "QtQuick.Templates"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
- RESOURCE_PREFIX "/qt-project.org/imports"
SOURCES
qtquicktemplates2plugin.cpp
DEFINES