diff --git a/examples/canvas3d/jsonmodels/deployment.pri b/examples/canvas3d/jsonmodels/deployment.pri deleted file mode 100644 index 5441b63dc855592018a104ca9f08a76f996f4b69..0000000000000000000000000000000000000000 --- a/examples/canvas3d/jsonmodels/deployment.pri +++ /dev/null @@ -1,27 +0,0 @@ -android-no-sdk { - target.path = /data/user/qt - export(target.path) - INSTALLS += target -} else:android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/examples/canvas3d/jsonmodels/jsonmodels.pro b/examples/canvas3d/jsonmodels/jsonmodels.pro index df8e92564f689e516be468eb82240a2ec3d40017..8c74705657b66f7205e8983f75710c9a7dff60cf 100644 --- a/examples/canvas3d/jsonmodels/jsonmodels.pro +++ b/examples/canvas3d/jsonmodels/jsonmodels.pro @@ -1,6 +1,6 @@ -TEMPLATE = app - -QT += qml quick +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} SOURCES += main.cpp @@ -8,9 +8,3 @@ RESOURCES += qml.qrc OTHER_FILES += doc/src/* \ doc/images/* - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Default rules for deployment. -include(deployment.pri)