diff options
| author | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
| commit | ff8c99eb54f33108709f9f3107b35780a80f3f17 (patch) | |
| tree | 11d4c08809bf90fd8b25b175b4903ab00d36e3d6 /src/gui/kernel/kernel.pri | |
| parent | 28c7e17d9eeb8264ad9e26a5b93e5ff744add9a6 (diff) | |
| parent | 7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (diff) | |
| download | Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.zip Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.gz Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.bz2 | |
Merge remote branch 'qt-mainline/master'
Conflicts:
configure
Diffstat (limited to 'src/gui/kernel/kernel.pri')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 32fa3d3..3aa28a4 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -248,7 +248,8 @@ qpa { kernel/qplatformglcontext_qpa.cpp \ kernel/qplatformcursor_qpa.cpp \ kernel/qplatformclipboard_qpa.cpp \ - kernel/qplatformnativeinterface_qpa.cpp + kernel/qplatformnativeinterface_qpa.cpp \ + kernel/qsessionmanager_qpa.cpp contains(QT_CONFIG, glib) { SOURCES += \ |