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/widgets/widgets.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/widgets/widgets.pri')
| -rw-r--r-- | src/gui/widgets/widgets.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri index 5ee693c..9c59488 100644 --- a/src/gui/widgets/widgets.pri +++ b/src/gui/widgets/widgets.pri @@ -81,8 +81,7 @@ HEADERS += \ widgets/qtoolbararealayout_p.h \ widgets/qplaintextedit.h \ widgets/qplaintextedit_p.h \ - widgets/qprintpreviewwidget.h \ - widgets/qactiontokeyeventmapper_p.h + widgets/qprintpreviewwidget.h SOURCES += \ widgets/qabstractbutton.cpp \ widgets/qabstractslider.cpp \ @@ -143,8 +142,7 @@ SOURCES += \ widgets/qwidgetanimator.cpp \ widgets/qtoolbararealayout.cpp \ widgets/qplaintextedit.cpp \ - widgets/qprintpreviewwidget.cpp \ - widgets/qactiontokeyeventmapper.cpp + widgets/qprintpreviewwidget.cpp !embedded:!embedded_lite:mac { HEADERS += widgets/qmacnativewidget_mac.h \ |