diff options
| author | Andy Nichols <andy.nichols@nokia.com> | 2011-09-13 13:37:18 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@nokia.com> | 2011-09-13 13:37:18 +0200 |
| commit | f06d67635c5953b8f3a9908b2c989abe845d16c1 (patch) | |
| tree | 0395504ffedbbb0b8356be040158ae9a5678ecac | |
| parent | 97796083f8a31e536e65c4e125feffddeaf826ac (diff) | |
Cleaned up project files
Removed references to Widgets module that is not needed anymore. Also
make qml-compositor deployable with make install.
| -rw-r--r-- | examples/qml-compositor/qml-compositor.pro | 11 | ||||
| -rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 1 | ||||
| -rw-r--r-- | src/qt-compositor/qt-compositor.pro | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index 4390133..aea2fdc 100644 --- a/examples/qml-compositor/qml-compositor.pro +++ b/examples/qml-compositor/qml-compositor.pro @@ -1,7 +1,3 @@ -qml_folder.source = qml/QmlCompositor -qml_folder.target = qml -DEPLOYMENTFOLDERS = qml_folder - TEMPLATE = app TARGET = qml-compositor DEPENDPATH += . @@ -14,11 +10,11 @@ DESTDIR=$$PWD/../../bin/ LIBS += -L ../../lib -QT += declarative +QT += declarative v8 QT += opengl # to be removed once scenegraph gets rid of its widget dependencies -QT += widgets widgets-private +#QT += widgets widgets-private !isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) { QT += core-private gui-private declarative-private opengl-private @@ -26,6 +22,9 @@ QT += widgets widgets-private include (../../src/qt-compositor/qt-compositor.pri) +target.path += $$[QT_INSTALL_BINS] +INSTALLS += target + # Input SOURCES += main.cpp RESOURCES = qml-compositor.qrc diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index 5b160a8..f0aa50d 100644 --- a/examples/qwindow-compositor/qwindow-compositor.pro +++ b/examples/qwindow-compositor/qwindow-compositor.pro @@ -8,6 +8,7 @@ CONFIG += use_pkgconfig DESTDIR=$$PWD/../../bin/ +LIBS += -L ../../lib include (../../src/qt-compositor/qt-compositor.pri) # Input diff --git a/src/qt-compositor/qt-compositor.pro b/src/qt-compositor/qt-compositor.pro index d24766d..0d12277 100644 --- a/src/qt-compositor/qt-compositor.pro +++ b/src/qt-compositor/qt-compositor.pro @@ -13,4 +13,3 @@ headers.files = $$HEADERS INSTALLS = target headers QT += gui-private -QT += widgets-private |