diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/openvg/openvg.pro | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/openvg/openvg.pro')
| -rw-r--r-- | src/openvg/openvg.pro | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro deleted file mode 100644 index bd9aa1a732..0000000000 --- a/src/openvg/openvg.pro +++ /dev/null @@ -1,76 +0,0 @@ -TARGET = QtOpenVG -QT += core-private \ - gui-private - -CONFIG += module -MODULE_PRI = ../modules/qt_openvg.pri - -DEFINES+=QT_BUILD_OPENVG_LIB - -contains(QT_CONFIG, shivavg) { - DEFINES += QVG_NO_DRAW_GLYPHS - DEFINES += QVG_NO_RENDER_TO_MASK - DEFINES += QVG_SCISSOR_CLIP -} - -HEADERS += \ - qvg.h \ - qvg_p.h \ - qpaintengine_vg_p.h \ - qpixmapdata_vg_p.h \ - qpixmapfilter_vg_p.h \ - qvgcompositionhelper_p.h \ - qvgimagepool_p.h \ - qvgfontglyphcache_p.h -SOURCES += \ - qpaintengine_vg.cpp \ - qpixmapdata_vg.cpp \ - qpixmapfilter_vg.cpp \ - qvgimagepool.cpp - -contains(QT_CONFIG, egl) { - HEADERS += \ - qwindowsurface_vgegl_p.h \ - qwindowsurface_vg_p.h - SOURCES += \ - qwindowsurface_vg.cpp \ - qwindowsurface_vgegl.cpp -} - -symbian { - DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING QVG_SCISSOR_CLIP - SOURCES += \ - qvg_symbian.cpp - - contains(QT_CONFIG, freetype) { - DEFINES += QT_NO_FONTCONFIG - INCLUDEPATH += \ - ../3rdparty/freetype/src \ - ../3rdparty/freetype/include - } -} - -load(qt_module_config) - -HEADERS += $$QT_SOURCE_TREE/src/openvg/qtopenvgversion.h - -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -symbian:TARGET.UID3 = 0x2001E62F - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS_PRIVATE += $$QMAKE_LIBS_OPENVG - -contains(QT_CONFIG, egl) { - !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL - !isEmpty(QMAKE_LIBDIR_EGL): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_EGL - !isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL -} - -contains(QT_CONFIG, openvg_on_opengl) { - !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL - !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENGL - !isEmpty(QMAKE_LIBS_OPENGL): LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL -} - -INCLUDEPATH += ../3rdparty/harfbuzz/src |