diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 13:35:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 12:53:46 +0200 |
| commit | 8afc0676471b4802884ca7ee78d0097f1e5b5646 (patch) | |
| tree | 0e62d61de96e80883ba06ccec7cda9f8edca5e1c /src/gui/egl/egl.pri | |
| parent | b22d290a37903f2c5ecfe58e8183cd293ead99dc (diff) | |
QtGui: Remove Q_WS and qpa.
Enable compilation without -qpa.
Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building.
Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/egl/egl.pri')
| -rw-r--r-- | src/gui/egl/egl.pri | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri index ec23da3312..b13c43e371 100644 --- a/src/gui/egl/egl.pri +++ b/src/gui/egl/egl.pri @@ -24,19 +24,13 @@ contains(QT_CONFIG, egl): { wince*: SOURCES += egl/qegl_wince.cpp - unix { - qpa { - SOURCES += egl/qegl_qpa.cpp - } else { - symbian { - SOURCES += egl/qegl_symbian.cpp - } else { - SOURCES += egl/qegl_x11.cpp - } - } - } -} else:symbian { - DEFINES += QT_NO_EGL - SOURCES += egl/qegl_stub.cpp - SOURCES += egl/qeglproperties_stub.cpp + symbian { + SOURCES += egl/qegl_symbian.cpp + } else { + SOURCES += egl/qegl_qpa.cpp + } +} else:symbian: { + DEFINES += QT_NO_EGL + SOURCES += egl/qegl_stub.cpp + SOURCES += egl/qeglproperties_stub.cpp } |