Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
|
Merge-request: 569
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
QtDBus module is useless with QT_NO_PROPERTIES. Add D-Bus section and
DBUS feature which requires PROPERTIES. Update qfeatures.h. Disable
QtDBus module, a bearer management plugin for NetworkManager and a
script plugin for QtDBus when QT_NO_DBUS is defined.
Merge-request: 511
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
Reviewed-by: Trust Me
|
|
Reviewed-by: Trust Me
|
|
Reviewed-by: Trust Me
|
|
Reviewed-by: Trust Me
|
|
Reviewed-by: Trust Me
|
|
|