diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-19 23:40:10 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-19 23:40:10 (GMT) |
| commit | 7a3ae63fc95ebb9fd7e380aa35cfdf7d5e68fc03 (patch) | |
| tree | 99911d2972733f49fe3173ef9bc9db2fd936f535 /mkspecs | |
| parent | 2475afbcc7e245cd3739af02f12b8508adea3738 (diff) | |
| download | Qt-7a3ae63fc95ebb9fd7e380aa35cfdf7d5e68fc03.zip Qt-7a3ae63fc95ebb9fd7e380aa35cfdf7d5e68fc03.tar.gz Qt-7a3ae63fc95ebb9fd7e380aa35cfdf7d5e68fc03.tar.bz2 | |
Make openvg.prf work properly
This change makes "QT += openvg" include the right includes and libs
via openvg.prf automatically.
Reviewed-by: trustme
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/unix/openvg.prf | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 332eaca..1bac953 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -159,6 +159,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { } else { DEFINES *= $$upper(QT_$${QTLIB}_LIB) isEqual(QTLIB, opengl):CONFIG += opengl + isEqual(QTLIB, openvg):CONFIG += openvg isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT isEqual(QTLIB, testlib):CONFIG += console isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces diff --git a/mkspecs/features/unix/openvg.prf b/mkspecs/features/unix/openvg.prf index a21d1ca..29acec1 100644 --- a/mkspecs/features/unix/openvg.prf +++ b/mkspecs/features/unix/openvg.prf @@ -1,9 +1,15 @@ !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG !isEmpty(QMAKE_LIBDIR_OPENVG): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $QMAKE_LIBS_OPENVG +!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG + +contains(QT_CONFIG, egl) { + !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 +} contains(QT_CONFIG, openvg_on_opengl) { !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL !isEmpty(QMAKE_LIBDIR_OPENGL): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENGL - !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $QMAKE_LIBS_OPENGL + !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL } |