diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
| commit | 801a3780c9d029a288f60ddc4485ce34bd7fa94f (patch) | |
| tree | ff0728320e1938908912506ab776299af6d45543 /src/gui/kernel/kernel.pri | |
| parent | 2ff6c9e8d89590c8180769bd54e545f40ca9a56f (diff) | |
| parent | 8d3d7d411491e50c1c6a62f473a1fa69a3ca2773 (diff) | |
| download | Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.zip Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.gz Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.bz2 | |
Merge branch '4.6' into lighthouse
Conflicts:
configure
src/gui/image/qpixmapdatafactory.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/gui/kernel/kernel.pri')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 85c838b..1ae6d29 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -46,7 +46,8 @@ HEADERS += \ kernel/qgesture.h \ kernel/qgesture_p.h \ kernel/qstandardgestures.h \ - kernel/qstandardgestures_p.h + kernel/qstandardgestures_p.h \ + kernel/qsoftkeymanager_p.h SOURCES += \ kernel/qaction.cpp \ @@ -77,7 +78,8 @@ SOURCES += \ kernel/qwidgetaction.cpp \ kernel/qkeymapper.cpp \ kernel/qgesture.cpp \ - kernel/qstandardgestures.cpp + kernel/qstandardgestures.cpp \ + kernel/qsoftkeymanager.cpp win32 { DEFINES += QT_NO_DIRECTDRAW |