summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTitta Heikkala <EXT-Titta.2.Heikkala@nokia.com>2010-10-21 08:09:36 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2010-10-21 08:09:36 (GMT)
commit5102cf81c31ff59aca03273daab9d797eb818058 (patch)
treeece68c1e995f98fb0d0a3f791cd13cfdc800690b
parenta3ceea583b9d14f809e4bf24a9c86fb9179a7797 (diff)
downloadQt-5102cf81c31ff59aca03273daab9d797eb818058.zip
Qt-5102cf81c31ff59aca03273daab9d797eb818058.tar.gz
Qt-5102cf81c31ff59aca03273daab9d797eb818058.tar.bz2
Added include for missing file for Symbian3
Symbian3 has KClipboardUidTypePlainText defined in different file to previous Symbian versions. The missing file is now included. Task-number: QT-2085 Reviewed-by: Janne Koskinen Merge-request: 870 Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
-rw-r--r--src/gui/kernel/qclipboard_s60.cpp3
-rw-r--r--tests/auto/qclipboard/tst_qclipboard.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index 7b145a8..c9b1d23 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -50,6 +50,9 @@
#include "qwidget.h"
#include "qevent.h"
#include "private/qcore_symbian_p.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "txtclipboard.h"
+#endif
#include "txtetext.h"
#include <QtDebug>
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index a4fac43..3437b53 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -52,6 +52,9 @@
#include "txtetext.h"
#include <baclipb.h>
#endif
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "txtclipboard.h"
+#endif
//TESTED_CLASS=
//TESTED_FILES=