summaryrefslogtreecommitdiff
path: root/src/dbus/qdbusmacros.h
AgeCommit message (Collapse)AuthorFilesLines
2010-05-17Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart1-1/+3
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
2010-05-04Allow QtDBus to be compiled as a static library on Windows.Thomas Sondergaard1-1/+3
Merge-request: 569 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
2010-04-08Introduce a qconfig feature for QtDBusTasuku Suzuki1-0/+3
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>
2010-01-07Update copyright year to 2010Jason McDonald1-1/+1
Reviewed-by: Trust Me
2009-09-09Update license headers again.Jason McDonald1-4/+4
Reviewed-by: Trust Me
2009-08-31Update tech preview license header.Jason McDonald1-13/+13
Reviewed-by: Trust Me
2009-08-11Update license headers.Jason McDonald1-1/+1
Reviewed-by: Trust Me
2009-06-16Update license headers as requested by the marketing department.Jason McDonald1-2/+2
Reviewed-by: Trust Me
2009-03-23Long live Qt 4.5!Lars Knoll1-0/+73