diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index 1414cef3d564bdb44963a5bc3e922556b2c42741..944ffaac3da0685f3582f95129ad276752741350 100644 --- a/examples/qml-compositor/qml-compositor.pro +++ b/examples/qml-compositor/qml-compositor.pro @@ -1,8 +1,3 @@ -TEMPLATE = app -TARGET = qml-compositor -DEPENDPATH += . -INCLUDEPATH += . - DEFINES += QT_COMPOSITOR_QUICK # comment out the following to not use pkg-config in the pri files @@ -20,15 +15,9 @@ QT += compositor # the following line #include (../../src/compositor/compositor.pri) -# Input SOURCES += main.cpp RESOURCES = qml-compositor.qrc -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/release-shared -MOC_DIR = .moc/release-shared - -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qml-compositor diff --git a/examples/qwidget-compositor/qwidget-compositor.pro b/examples/qwidget-compositor/qwidget-compositor.pro index 3cf4a4a7e39c16f4243640eade903a447f51587c..beec269ca3e9016069cae146ff2ebafcb3fa48c0 100644 --- a/examples/qwidget-compositor/qwidget-compositor.pro +++ b/examples/qwidget-compositor/qwidget-compositor.pro @@ -1,8 +1,3 @@ -TEMPLATE = app -TARGET = qwidget-compositor -DEPENDPATH += . -INCLUDEPATH += . - # comment out the following to not use pkg-config in the pri files CONFIG += use_pkgconfig @@ -14,10 +9,6 @@ CONFIG += use_pkgconfig # to make QtCompositor/... style includes working without installing INCLUDEPATH += $$PWD/../../include -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/release-shared -MOC_DIR = .moc/release-shared - # Touch support isEmpty(QT_SOURCE_TREE) { QTBASE = $$[QT_INSTALL_DATA] @@ -25,7 +16,6 @@ isEmpty(QT_SOURCE_TREE) { QTBASE = $$QT_SOURCE_TREE } -# Input HEADERS += \ textureblitter.h @@ -35,7 +25,6 @@ SOURCES += \ QT += core-private gui-private widgets widgets-private opengl opengl-private compositor -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwidget-compositor sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwidget-compositor.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwidget-compositor diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index 07c6be37d3f4fe886e62c526342c9bab6367c154..068b0889310cfb22259fd0fb55731d5ba7955efe 100644 --- a/examples/qwindow-compositor/qwindow-compositor.pro +++ b/examples/qwindow-compositor/qwindow-compositor.pro @@ -1,7 +1,4 @@ -TEMPLATE = app -TARGET = qwindow-compositor -DEPENDPATH += . -INCLUDEPATH += . +QT += gui gui-private core-private compositor # comment out the following to not use pkg-config in the pri files CONFIG += use_pkgconfig @@ -14,20 +11,11 @@ HEADERS += \ qwindowcompositor.h \ textureblitter.h -# Input SOURCES += main.cpp \ qopenglwindow.cpp \ qwindowcompositor.cpp \ textureblitter.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/release-shared -MOC_DIR = .moc/release-shared - -QT += gui gui-private core-private - -QT += compositor - # to make QtCompositor/... style includes working without installing INCLUDEPATH += $$PWD/../../include @@ -38,7 +26,6 @@ INCLUDEPATH += $$PWD/../../include RESOURCES += qwindow-compositor.qrc -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwindow-compositor.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtwayland/qwindow-compositor