diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
| commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
| tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /examples/quick/scenegraph/metaltextureimport | |
| parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
| parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'examples/quick/scenegraph/metaltextureimport')
| -rw-r--r-- | examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc index 2a584c26cc..55cbcd8f2e 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -29,7 +29,7 @@ \example scenegraph/metaltextureimport \title Scene Graph - Metal Texture Import \ingroup qtquickexamples - \brief Shows how to use a texture created directly with Metal + \brief Shows how to use a texture created directly with Metal. \image metaltextureimport-example.jpg diff --git a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro index 5b11606946..bbdfd358d3 100644 --- a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro +++ b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.pro @@ -1,4 +1,4 @@ -!macos: error("This example requires macOS") +!macos:!ios: error("This example requires macOS or iOS") QT += qml quick @@ -6,7 +6,8 @@ HEADERS += metaltextureimport.h SOURCES += metaltextureimport.mm main.cpp RESOURCES += metaltextureimport.qrc -LIBS += -framework Metal -framework AppKit +LIBS += -framework Metal +macos: LIBS += -framework AppKit target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/metaltextureimport INSTALLS += target |