diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/CMakeLists.txt qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/CMakeLists.txt
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/CMakeLists.txt	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/CMakeLists.txt	2014-04-12 19:02:10.000000000 +0000
@@ -159,6 +159,9 @@
 
 # designer plugin
 if (BUILD_DESIGNER_PLUGIN)
+    if (USE_QT5)
+        message(FATAL_ERROR "Building Qt designer plugin is not supported for Qt5 yet. Use -DBUILD_DESIGNER_PLUGIN=0")
+    endif (USE_QT5)
     message(STATUS "Building Qt designer plugin")
 
     include_directories(designer
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/debian/bzr-builder.manifest qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/debian/bzr-builder.manifest
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/debian/bzr-builder.manifest	2014-04-11 19:03:53.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/debian/bzr-builder.manifest	2014-04-12 19:02:11.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.2 deb-version 0.0.1+bzr58+201404111903
-lp:~lubuntu-dev/lxde/qtermwidget revid:git-v1:d6ceb5ae003a05fbdc0e44f1ad7f592bfba6eb7f
+# bzr-builder format 0.2 deb-version 0.0.1+bzr59+201404121902
+lp:~lubuntu-dev/lxde/qtermwidget revid:git-v1:5d3ef34cc2d08ddc2a8b446c03581c154b7b65d7
 nest packaging lp:~lubuntu-dev/lxde/qtermwidget-debian debian revid:gilir@ubuntu.com-20131102094950-mud35nqoyw3zjvhd
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/debian/changelog qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/debian/changelog
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/debian/changelog	2014-04-11 19:03:53.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/debian/changelog	2014-04-12 19:02:11.000000000 +0000
@@ -1,8 +1,8 @@
-qtermwidget (0.0.1+bzr58+201404111903~ubuntu13.10.1) saucy; urgency=low
+qtermwidget (0.0.1+bzr59+201404121902~ubuntu13.10.1) saucy; urgency=low
 
   * Auto build.
 
- -- Julien Lavergne <julien.lavergne@gmail.com>  Fri, 11 Apr 2014 19:03:53 +0000
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Sat, 12 Apr 2014 19:02:11 +0000
 
 qtermwidget (0.0.1-1~ppa2) saucy; urgency=low
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/BlockArray.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/BlockArray.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/BlockArray.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/BlockArray.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -21,11 +21,11 @@
 
 */
 
+#include <QtDebug>
+
 // Own
 #include "BlockArray.h"
 
-#include <QtCore>
-
 // System
 #include <assert.h>
 #include <sys/mman.h>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/CharacterColor.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/CharacterColor.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/CharacterColor.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/CharacterColor.h	2014-04-12 19:02:10.000000000 +0000
@@ -24,7 +24,7 @@
 #define CHARACTERCOLOR_H
 
 // Qt
-#include <QtGui/QColor>
+#include <QColor>
 
 //#include <kdemacros.h>
 #define KDE_NO_EXPORT
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Character.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Character.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Character.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Character.h	2014-04-12 19:02:10.000000000 +0000
@@ -24,7 +24,7 @@
 #define CHARACTER_H
 
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 
 // Local
 #include "CharacterColor.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ColorScheme.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ColorScheme.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ColorScheme.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ColorScheme.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -24,9 +24,9 @@
 #include "tools.h"
 
 // Qt
-#include <QtGui/QBrush>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QBrush>
+#include <QFile>
+#include <QFileInfo>
 #include <QtDebug>
 #include <QSettings>
 #include <QDir>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ColorScheme.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ColorScheme.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ColorScheme.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ColorScheme.h	2014-04-12 19:02:10.000000000 +0000
@@ -23,11 +23,11 @@
 #define COLORSCHEME_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QIODevice>
-#include <QtCore/QSet>
+#include <QHash>
+#include <QList>
+#include <QMetaType>
+#include <QIODevice>
+#include <QSet>
 #include <QSettings>
 
 // Konsole
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Emulation.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Emulation.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Emulation.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Emulation.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -29,15 +29,15 @@
 #include <unistd.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QHash>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
-#include <QtCore/QThread>
+#include <QApplication>
+#include <QClipboard>
+#include <QHash>
+#include <QKeyEvent>
+#include <QRegExp>
+#include <QTextStream>
+#include <QThread>
 
-#include <QtCore/QTime>
+#include <QTime>
 
 // KDE
 //#include <kdebug.h>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Emulation.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Emulation.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Emulation.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Emulation.h	2014-04-12 19:02:10.000000000 +0000
@@ -27,11 +27,11 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 //#include <QPointer>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
+#include <QTextCodec>
+#include <QTextStream>
+#include <QTimer>
 
 // Konsole
 //#include "konsole_export.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Filter.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Filter.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Filter.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Filter.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -24,13 +24,13 @@
 #include <iostream>
 
 // Qt
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QSharedData>
-#include <QtCore/QFile>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QString>
+#include <QTextStream>
+#include <QSharedData>
+#include <QFile>
 #include <QDesktopServices>
 #include <QUrl>
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Filter.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Filter.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Filter.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Filter.h	2014-04-12 19:02:10.000000000 +0000
@@ -21,12 +21,12 @@
 #define FILTER_H
 
 // Qt
-#include <QtGui/QAction>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QRegExp>
+#include <QAction>
+#include <QList>
+#include <QObject>
+#include <QStringList>
+#include <QHash>
+#include <QRegExp>
 
 // Local
 #include "Character.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/History.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/History.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/History.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/History.h	2014-04-12 19:02:10.000000000 +0000
@@ -22,9 +22,9 @@
 #define TEHISTORY_H
 
 // Qt
-#include <QtCore/QBitRef>
-#include <QtCore/QHash>
-#include <QtCore/QVector>
+#include <QBitRef>
+#include <QHash>
+#include <QVector>
 #include <QTemporaryFile>
 
 // KDE
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/KeyboardTranslator.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/KeyboardTranslator.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/KeyboardTranslator.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/KeyboardTranslator.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -27,11 +27,11 @@
 #include <stdio.h>
 
 // Qt
-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtGui/QKeySequence>
+#include <QBuffer>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QKeySequence>
 #include <QDir>
 #include <QtDebug>
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/KeyboardTranslator.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/KeyboardTranslator.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/KeyboardTranslator.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/KeyboardTranslator.h	2014-04-12 19:02:10.000000000 +0000
@@ -23,11 +23,11 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtGui/QKeySequence>
-#include <QtCore/QMetaType>
-#include <QtCore/QVarLengthArray>
+#include <QHash>
+#include <QList>
+#include <QKeySequence>
+#include <QMetaType>
+#include <QVarLengthArray>
 
 // Konsole
 //#include "konsole_export.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/konsole_wcwidth.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/konsole_wcwidth.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/konsole_wcwidth.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/konsole_wcwidth.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -7,6 +7,8 @@
  * Markus Kuhn -- 2001-01-12 -- public domain
  */
 
+#include <QString>
+
 #include "konsole_wcwidth.h"
 
 struct interval {
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/konsole_wcwidth.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/konsole_wcwidth.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/konsole_wcwidth.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/konsole_wcwidth.h	2014-04-12 19:02:10.000000000 +0000
@@ -11,8 +11,9 @@
 #define _KONSOLE_WCWIDTH_H_
 
 // Qt
-#include <QtCore/QBool>
-#include <QtCore/QString>
+#include <QtGlobal>
+
+class QString;
 
 int konsole_wcwidth(quint16 ucs);
 #if 0
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kprocess.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kprocess.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kprocess.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kprocess.h	2014-04-12 19:02:10.000000000 +0000
@@ -32,7 +32,7 @@
 
 //#include <kdecore_export.h>
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 class KProcessPrivate;
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include "kpty_p.h"
 
+#include <QtDebug>
+
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #define HAVE_LOGIN
@@ -138,8 +140,6 @@
 //#include <kdebug.h>
 //#include <kstandarddirs.h>  // findExe
 
-#include <QtCore>
-
 // not defined on HP-UX for example
 #ifndef CTRL
 # define CTRL(x) ((x) & 037)
@@ -269,8 +269,8 @@
     // Linux device names, FIXME: Trouble on other systems?
     for (const char * s3 = "pqrstuvwxyzabcde"; *s3; s3++) {
         for (const char * s4 = "0123456789abcdef"; *s4; s4++) {
-            ptyName = QString().sprintf("/dev/pty%c%c", *s3, *s4).toAscii();
-            d->ttyName = QString().sprintf("/dev/tty%c%c", *s3, *s4).toAscii();
+            ptyName = QString().sprintf("/dev/pty%c%c", *s3, *s4).toUtf8();
+            d->ttyName = QString().sprintf("/dev/tty%c%c", *s3, *s4).toUtf8();
 
             d->masterFd = ::open(ptyName.data(), O_RDWR);
             if (d->masterFd >= 0) {
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kptydevice.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kptydevice.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kptydevice.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kptydevice.h	2014-04-12 19:02:10.000000000 +0000
@@ -31,11 +31,12 @@
 
 #include "kpty_p.h"
 
-#include <QtCore/QIODevice>
+#include <QIODevice>
 
 #define KMAXINT ((int)(~0U >> 1))
 
 struct KPtyDevicePrivate;
+class QSocketNotifier;
 
 #define Q_DECLARE_PRIVATE_MI(Class, SuperClass) \
     inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(SuperClass::d_ptr); } \
@@ -166,8 +167,8 @@
 // Helper. Remove when QRingBuffer becomes public. //
 /////////////////////////////////////////////////////
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlinkedlist.h>
+#include <QByteArray>
+#include <QLinkedList>
 
 #define CHUNKSIZE 4096
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty.h	2014-04-12 19:02:10.000000000 +0000
@@ -23,7 +23,7 @@
 #ifndef kpty_h
 #define kpty_h
 
-#include <QtCore>
+#include <QObject>
 
 struct KPtyPrivate;
 struct termios;
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty_p.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty_p.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/kpty_p.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/kpty_p.h	2014-04-12 19:02:10.000000000 +0000
@@ -25,7 +25,7 @@
 
 #include "kpty.h"
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 struct KPtyPrivate {
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Pty.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Pty.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Pty.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Pty.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -38,7 +38,8 @@
 #include <signal.h>
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
+#include <QtDebug>
 
 #include "kpty.h"
 #include "kptydevice.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Pty.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Pty.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Pty.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Pty.h	2014-04-12 19:02:10.000000000 +0000
@@ -32,10 +32,10 @@
 #define PTY_H
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QSize>
+#include <QStringList>
+#include <QVector>
+#include <QList>
+#include <QSize>
 
 // KDE
 #include "kptyprocess.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/qtermwidget.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/qtermwidget.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/qtermwidget.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/qtermwidget.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -17,13 +17,12 @@
 */
 
 #include <QLayout>
-#include <QtGui/qboxlayout.h>
-#include <QtGui/qlayoutitem.h>
-#include <QtGui/qsizepolicy.h>
-#include "SearchBar.h"
-#include "qtermwidget.h"
-#include "ColorTables.h"
+#include <QBoxLayout>
+#include <QtDebug>
+#include <QDir>
+#include <QMessageBox>
 
+#include "ColorTables.h"
 #include "Session.h"
 #include "Screen.h"
 #include "ScreenWindow.h"
@@ -32,6 +31,8 @@
 #include "KeyboardTranslator.h"
 #include "ColorScheme.h"
 #include "SearchBar.h"
+#include "qtermwidget.h"
+
 
 #define STEP_ZOOM 1
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/qtermwidget.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/qtermwidget.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/qtermwidget.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/qtermwidget.h	2014-04-12 19:02:10.000000000 +0000
@@ -20,8 +20,9 @@
 #ifndef _Q_TERM_WIDGET
 #define _Q_TERM_WIDGET
 
-#include <QtGui>
+#include <QWidget>
 
+class QVBoxLayout;
 struct TermWidgetImpl;
 class SearchBar;
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Screen.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Screen.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Screen.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Screen.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -32,8 +32,8 @@
 #include <ctype.h>
 
 // Qt
-#include <QtCore/QTextStream>
-#include <QtCore/QDate>
+#include <QTextStream>
+#include <QDate>
 
 // KDE
 //#include <kdebug.h>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Screen.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Screen.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Screen.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Screen.h	2014-04-12 19:02:10.000000000 +0000
@@ -24,9 +24,9 @@
 #define SCREEN_H
 
 // Qt
-#include <QtCore/QRect>
-#include <QtCore/QTextStream>
-#include <QtCore/QVarLengthArray>
+#include <QRect>
+#include <QTextStream>
+#include <QVarLengthArray>
 
 // Konsole
 #include "Character.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ScreenWindow.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ScreenWindow.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ScreenWindow.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ScreenWindow.h	2014-04-12 19:02:10.000000000 +0000
@@ -21,9 +21,9 @@
 #define SCREENWINDOW_H
 
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QPoint>
-#include <QtCore/QRect>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
 
 // Konsole
 #include "Character.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Session.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Session.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Session.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Session.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -30,14 +30,14 @@
 #include <stdlib.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtCore/QByteRef>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QStringList>
-#include <QtCore/QFile>
-#include <QtCore>
+#include <QApplication>
+#include <QByteRef>
+#include <QDir>
+#include <QFile>
+#include <QRegExp>
+#include <QStringList>
+#include <QFile>
+#include <QtDebug>
 
 #include "Pty.h"
 //#include "kptyprocess.h"
@@ -460,7 +460,7 @@
 {
     if (state==NOTIFYBELL) {
         QString s;
-        s.sprintf("Bell in session '%s'",_nameTitle.toAscii().data());
+        s.sprintf("Bell in session '%s'",_nameTitle.toUtf8().data());
 
         emit bellRequest( s );
     } else if (state==NOTIFYACTIVITY) {
@@ -608,16 +608,16 @@
 
         if (_shellProcess->exitStatus() == QProcess::NormalExit) {
             message.sprintf("Session '%s' exited with status %d.",
-                          _nameTitle.toAscii().data(), exitStatus);
+                          _nameTitle.toUtf8().data(), exitStatus);
         } else {
             message.sprintf("Session '%s' crashed.",
-                          _nameTitle.toAscii().data());
+                          _nameTitle.toUtf8().data());
         }
     }
 
     if ( !_wantedClose && _shellProcess->exitStatus() != QProcess::NormalExit )
         message.sprintf("Session '%s' exited unexpectedly.",
-                        _nameTitle.toAscii().data());
+                        _nameTitle.toUtf8().data());
     else
         emit finished();
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ShellCommand.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ShellCommand.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/ShellCommand.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/ShellCommand.h	2014-04-12 19:02:10.000000000 +0000
@@ -23,7 +23,7 @@
 #define SHELLCOMMAND_H
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace Konsole {
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalCharacterDecoder.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalCharacterDecoder.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalCharacterDecoder.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalCharacterDecoder.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -23,7 +23,7 @@
 #include "TerminalCharacterDecoder.h"
 
 // Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 // KDE
 //#include <kdebug.h>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalDisplay.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalDisplay.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalDisplay.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalDisplay.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -24,24 +24,26 @@
 #include "TerminalDisplay.h"
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QEvent>
-#include <QtCore/QTime>
-#include <QtCore/QFile>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyle>
-#include <QtCore/QTimer>
-#include <QtGui/QToolTip>
+#include <QApplication>
+#include <QBoxLayout>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QTime>
+#include <QFile>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPainter>
+#include <QPixmap>
+#include <QScrollBar>
+#include <QStyle>
+#include <QTimer>
+#include <QToolTip>
 #include <QtDebug>
 #include <QUrl>
+#include <QMimeData>
+#include <QDrag>
 
 // KDE
 //#include <kshell.h>
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalDisplay.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalDisplay.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/TerminalDisplay.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/TerminalDisplay.h	2014-04-12 19:02:10.000000000 +0000
@@ -22,9 +22,9 @@
 #define TERMINALDISPLAY_H
 
 // Qt
-#include <QtGui/QColor>
-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QColor>
+#include <QPointer>
+#include <QWidget>
 
 // Konsole
 #include "Filter.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Vt102Emulation.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Vt102Emulation.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Vt102Emulation.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Vt102Emulation.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -43,9 +43,9 @@
 #include <assert.h>
 
 // Qt
-#include <QtCore/QEvent>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QByteRef>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QByteRef>
 
 // KDE
 //#include <kdebug.h>
@@ -973,7 +973,7 @@
                                          "into characters to send to the terminal " 
                                          "is missing.");
         reset();
-        receiveData( translatorError.toAscii().constData() , translatorError.count() );
+        receiveData( translatorError.toUtf8().constData() , translatorError.count() );
     }
 }
 
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Vt102Emulation.h qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Vt102Emulation.h
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/lib/Vt102Emulation.h	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/lib/Vt102Emulation.h	2014-04-12 19:02:10.000000000 +0000
@@ -27,9 +27,9 @@
 #include <stdio.h>
 
 // Qt 
-#include <QtGui/QKeyEvent>
-#include <QtCore/QHash>
-#include <QtCore/QTimer>
+#include <QKeyEvent>
+#include <QHash>
+#include <QTimer>
 
 // Konsole
 #include "Emulation.h"
diff -Nru qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/src/main.cpp qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/src/main.cpp
--- qtermwidget-0.0.1+bzr58+201404111903~ubuntu13.10.1/src/main.cpp	2014-04-11 19:03:52.000000000 +0000
+++ qtermwidget-0.0.1+bzr59+201404121902~ubuntu13.10.1/src/main.cpp	2014-04-12 19:02:10.000000000 +0000
@@ -15,15 +15,13 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-						
 
-#include <QtCore>
-#include <QtGui>
+
 #include <QApplication>
 #include <QtDebug>
-
 #include <QIcon>
-#include <QtGui/qicon.h>
+#include <QMainWindow>
+#include <QMenuBar>
 
 #include "qtermwidget.h"
 
@@ -39,6 +37,7 @@
     QMenu *actionsMenu = new QMenu("Actions", menuBar);
     menuBar->addMenu(actionsMenu);
     actionsMenu->addAction("Find..", console, SLOT(toggleShowSearchBar()), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F));
+    actionsMenu->addAction("About Qt", &app, SLOT(aboutQt()));
     mainWindow->setMenuBar(menuBar);       
     
     QFont font = QApplication::font();