diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-20 14:58:02 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-20 14:58:02 (GMT) |
| commit | fdda7f1dd01215e36116aa4e3428aae9f23dd711 (patch) | |
| tree | 68afea11c9bb7fb5554e9a83f9c0cd85d2d2de31 /src/gui/dialogs | |
| parent | d4c0be3b5758b37ef9da6fcbce4c5a6d84f3a52b (diff) | |
| parent | efea248b4b725ca429793874eb168ad4b43c7994 (diff) | |
| download | Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.zip Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.tar.gz Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfscompleter_p.h | 2 | ||||
| -rw-r--r-- | src/gui/dialogs/qprintdialog_unix.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfscompleter_p.h b/src/gui/dialogs/qfscompleter_p.h index f0fcdec..2e5a674 100644 --- a/src/gui/dialogs/qfscompleter_p.h +++ b/src/gui/dialogs/qfscompleter_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index a491532..d4d8f02 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -48,6 +48,7 @@ #include "qprintdialog.h" #include "qfiledialog.h" #include <QtCore/qdir.h> +#include <QtGui/qevent.h> #include <QtGui/qfilesystemmodel.h> #include <QtGui/qstyleditemdelegate.h> #include <QtGui/qprinter.h> |