diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-05-05 14:26:38 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-05-05 14:26:38 (GMT) |
| commit | cd308f32745c264b95bf3bc9ae3e0412aeae51b9 (patch) | |
| tree | 83f1be58498194b9a1a318fb6a379782db40cc53 /src/gui/gui.pro | |
| parent | 315ea8d679d4c600db8ca85aad37c99590d090bc (diff) | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| download | Qt-cd308f32745c264b95bf3bc9ae3e0412aeae51b9.zip Qt-cd308f32745c264b95bf3bc9ae3e0412aeae51b9.tar.gz Qt-cd308f32745c264b95bf3bc9ae3e0412aeae51b9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 300a03f..a6370b2 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -40,9 +40,8 @@ include(statemachine/statemachine.pri) include(math3d/math3d.pri) include(effects/effects.pri) -contains(QT_CONFIG, egl): include(egl/egl.pri) +include(egl/egl.pri) win32:!wince*: DEFINES += QT_NO_EGL - embedded: QT += network QMAKE_LIBS += $$QMAKE_LIBS_GUI |