diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-02-07 15:02:48 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-02-09 15:30:26 +0100 |
| commit | a90063986932de7aa4d2b949562b6ae286fb2b44 (patch) | |
| tree | 00c2d497343a8df6b23c8eada86ac6c6cb9318c4 /examples | |
| parent | 4e409a3bd627a262ada74394511b03e3b583f998 (diff) | |
colorpalette: Remove qrc file
Specify resources directly in the qmake project file instead.
This is consistent with the specification in CMakeLists.txt.
Also specify HEADERS in the qmake project file.
Task-number: QTBUG-110895
Pick-to: 6.5
Change-Id: Ic491917d47066e31639a6a8d94b3a567ee6d6766
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/httpserver/colorpalette/assets.qrc | 19 | ||||
| -rw-r--r-- | examples/httpserver/colorpalette/colorpalette.pro | 21 |
2 files changed, 20 insertions, 20 deletions
diff --git a/examples/httpserver/colorpalette/assets.qrc b/examples/httpserver/colorpalette/assets.qrc deleted file mode 100644 index b2e24bb..0000000 --- a/examples/httpserver/colorpalette/assets.qrc +++ /dev/null @@ -1,19 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>assets/colors.json</file> - <file>assets/users.json</file> - <file>assets/sessions.json</file> - <file>assets/img/1-image.jpg</file> - <file>assets/img/2-image.jpg</file> - <file>assets/img/3-image.jpg</file> - <file>assets/img/4-image.jpg</file> - <file>assets/img/5-image.jpg</file> - <file>assets/img/6-image.jpg</file> - <file>assets/img/7-image.jpg</file> - <file>assets/img/8-image.jpg</file> - <file>assets/img/9-image.jpg</file> - <file>assets/img/10-image.jpg</file> - <file>assets/img/11-image.jpg</file> - <file>assets/img/12-image.jpg</file> - </qresource> -</RCC> diff --git a/examples/httpserver/colorpalette/colorpalette.pro b/examples/httpserver/colorpalette/colorpalette.pro index 46c8b45..b532d26 100644 --- a/examples/httpserver/colorpalette/colorpalette.pro +++ b/examples/httpserver/colorpalette/colorpalette.pro @@ -9,10 +9,29 @@ QT += httpserver gui concurrent SOURCES += \ main.cpp +HEADERS += \ + apibehavior.h \ + types.h \ + utils.h + target.path = $$[QT_INSTALL_EXAMPLES]/httpserver/colorpalette INSTALLS += target RESOURCES += \ - assets.qrc + assets/colors.json \ + assets/users.json \ + assets/sessions.json \ + assets/img/1-image.jpg \ + assets/img/2-image.jpg \ + assets/img/3-image.jpg \ + assets/img/4-image.jpg \ + assets/img/5-image.jpg \ + assets/img/6-image.jpg \ + assets/img/7-image.jpg \ + assets/img/8-image.jpg \ + assets/img/9-image.jpg \ + assets/img/10-image.jpg \ + assets/img/11-image.jpg \ + assets/img/12-image.jpg CONFIG += cmdline |