diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/tools/uic | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/driver.cpp | 1 | ||||
| -rw-r--r-- | src/tools/uic/uic.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 16dc12f277..ea1d4f21f3 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -43,7 +43,6 @@ #include "uic.h" #include "ui4.h" -#include <QtCore/QRegExp> #include <QtCore/QFileInfo> #include <QtCore/QDebug> diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 2de3352cfc..4ae04149e8 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -58,7 +58,6 @@ #include <QtCore/QXmlStreamReader> #include <QtCore/QFileInfo> -#include <QtCore/QRegExp> #include <QtCore/QTextStream> #include <QtCore/QDateTime> |