diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
| commit | 4cd7180ad3365c0e8eef8a22c825f3289a799ab0 (patch) | |
| tree | e383d24055eb86e8b128d20517f5a0e0529eea8a /src/plugins/graphicssystems/openvg | |
| parent | 1e08ccc646e4f07fd560c901ff7b56626ed98d1e (diff) | |
| parent | 3368eea602d394812283d437b5e9d786e1af64e3 (diff) | |
| download | Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.zip Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.gz Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.bz2 | |
Merge branch 'master' into topic/mmfphonon
Conflicts:
src/3rdparty/phonon/phonon/factory.cpp
src/s60installs/qt_libs.pro
Diffstat (limited to 'src/plugins/graphicssystems/openvg')
| -rw-r--r-- | src/plugins/graphicssystems/openvg/openvg.pro | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro index 0abbfbd..d36570c 100644 --- a/src/plugins/graphicssystems/openvg/openvg.pro +++ b/src/plugins/graphicssystems/openvg/openvg.pro @@ -10,11 +10,3 @@ HEADERS = qgraphicssystem_vg_p.h target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG - -!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL -!isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL -!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL |