summaryrefslogtreecommitdiffstats
path: root/tests/auto/uic
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-16 15:26:22 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-16 15:26:22 (GMT)
commit8e59d3372d9ba18b48ae0b2271fa453332a1ac12 (patch)
tree61c3801151346b756c89040fa640ab1eb57d5f6e /tests/auto/uic
parent0b9638476c1a8bad4e33cbd20be1f6ff33935766 (diff)
parent90f2f19795a46f3ba1d46fd62f1cbe31072c2c53 (diff)
downloadQt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.zip
Qt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.tar.gz
Qt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts: src/3rdparty/harfbuzz/src/harfbuzz-shaper.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/auto/uic')
-rw-r--r--tests/auto/uic/baseline/config_fromuic3.ui.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui.h b/tests/auto/uic/baseline/config_fromuic3.ui.h
index 7e0189e..a97e8bc 100644
--- a/tests/auto/uic/baseline/config_fromuic3.ui.h
+++ b/tests/auto/uic/baseline/config_fromuic3.ui.h
@@ -45,7 +45,7 @@
** Form generated from reading UI file 'config_fromuic3.ui'
**
** Created: Thu Dec 17 12:48:42 2009
-** by: Qt User Interface Compiler version 4.6.3
+** by: Qt User Interface Compiler version 4.6.4
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/