diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:49:40 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:55:40 +0200 |
| commit | a6b6e760ac2f019b9ca42847b9535207966811aa (patch) | |
| tree | cdba2823eb3708f7a40593ff69b81d2be88515ea /src/tools/uic | |
| parent | 48ba459580c9e4ce28dbb2c3ce433175148da5a1 (diff) | |
| parent | 8ed47d961dc7e6f161030654d11cd330a542eadf (diff) | |
Merge remote branch 'gerrit/master' into HEAD
Conflicts:
configure.exe
src/corelib/global/qglobal.h
src/gui/kernel/qplatformnativeinterface_qpa.h
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qmenu_mac.mm
src/gui/widgets/qmenu_p.h
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qmenubar_p.h
src/gui/widgets/widgets.pri
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h
src/src.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qstring/tst_qstring.cpp
Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/qclass_lib_map.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 2d176552a8..09d275d8a1 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -514,7 +514,6 @@ QT_CLASS_LIB(QTest, QtTest, qtest.h) QT_CLASS_LIB(QtTestGui, QtTest, qtest_gui.h) QT_CLASS_LIB(QTestAccessibilityEvent, QtTest, qtestaccessible.h) QT_CLASS_LIB(QTestAccessibility, QtTest, qtestaccessible.h) -QT_CLASS_LIB(QTestBasicStreamer, QtTest, qtestbasicstreamer.h) QT_CLASS_LIB(QTestCoreElement, QtTest, qtestcoreelement.h) QT_CLASS_LIB(QTestCoreList, QtTest, qtestcorelist.h) QT_CLASS_LIB(QTestData, QtTest, qtestdata.h) @@ -527,11 +526,9 @@ QT_CLASS_LIB(QTestMouseEvent, QtTest, qtestevent.h) QT_CLASS_LIB(QTestDelayEvent, QtTest, qtestevent.h) QT_CLASS_LIB(QTestEventList, QtTest, qtestevent.h) QT_CLASS_LIB(QTestEventLoop, QtTest, qtesteventloop.h) -QT_CLASS_LIB(QTestLightXmlStreamer, QtTest, qtestlightxmlstreamer.h) QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) QT_CLASS_LIB(QSpontaneKeyEvent, QtTest, qtestspontaneevent.h) -QT_CLASS_LIB(QTestXmlStreamer, QtTest, qtestxmlstreamer.h) QT_CLASS_LIB(QTestXunitStreamer, QtTest, qtestxunitstreamer.h) QT_CLASS_LIB(QDBusAbstractAdaptor, QtDBus, qdbusabstractadaptor.h) QT_CLASS_LIB(QDBusAbstractInterfaceBase, QtDBus, qdbusabstractinterface.h) |