diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-21 17:52:56 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-21 20:05:25 +0100 |
commit | f9413889531c21b56e3b512c264c5dc9a85f8c74 (patch) | |
tree | 89ee8808050853f763b849b3ca91ef83cdd21186 | |
parent | 038184cad8d6a82a34897c9bdb9cc1be3ee124a5 (diff) |
clean up qmake-generated projects
remove assignmets which are defaults or bogus
Change-Id: I6e4fcef11e905ffbbb7a32210608faac7aa111e5
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
-rw-r--r-- | examples/qml-compositor/qml-compositor.pro | 11 | ||||
-rw-r--r-- | examples/qwidget-compositor/qwidget-compositor.pro | 11 | ||||
-rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 15 |
3 files changed, 1 insertions, 36 deletions
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index 1414cef3d..944ffaac3 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 3cf4a4a7e..beec269ca 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 07c6be37d..068b08893 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 |