Merge branch 'patches/0253-qmake_correct_path_separators', remote branches 'kde-qt... 4.7.1-patched
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Nov 2010 20:05:52 +0000 (21:05 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 30 Nov 2010 20:05:52 +0000 (21:05 +0100)
commitb427b5e64483612122e56104552a9704f6013680
tree8d2cf1c024d39e4ccae485fd727e3bf2dbc467bc
parentc119289d63c7357c515c9ecf8f79393c806364b2
parentf89482f9bf1cdc8d6ded43ede7c9c0070d43ff8e
parent44899291f7a82d2ffae6aaf4019dcfad823ec889
parentfa7f6e0ee0547341967c2da559ce731c756ece30
parent88300b961bec2d4a5063f6221dbeee4f77a72150
parenta0e01956595d41377324d4f31a43149b37c7f028
parente174df7530b009cfbcc1e1654a22ce9c4d02bba7
parent862805b55212aa83c7370bf80338b78139ccfefe
Merge branch 'patches/0253-qmake_correct_path_separators', remote branches 'kde-qt/patches/0180-window-role', 'kde-qt/patches/0195-compositing-properties', 'kde-qt/patches/0209-prevent-qt-mixing', 'kde-qt/patches/0216-allow-isystem-for-headers', 'kde-qt/patches/0225-invalidate-tabbar-geometry-on-refresh', 'kde-qt/patches/0250-out_of_source_build' and 'kde-qt/README' into 4.7.1-patched
bin/syncqt
configure
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_x11.cpp
src/gui/widgets/qtabbar.cpp
src/tools/moc/main.cpp