summaryrefslogtreecommitdiff
path: root/src/libs/zeroconf
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-098-56/+64
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Cleanup whitespaceOrgad Shaneh2014-05-161-1/+1
| | | | | | | Mostly trailing whitespace Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-222-3/+3
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-088-8/+8
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-221-3/+2
| | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-09-271-11/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginmanager.cpp src/libs/extensionsystem/pluginspec.cpp src/plugins/coreplugin/basefilewizard.cpp src/plugins/coreplugin/coreplugin.pro src/plugins/coreplugin/coreplugin.qbs src/plugins/coreplugin/editormanager/ieditor.cpp src/plugins/coreplugin/externaltool.cpp src/plugins/coreplugin/icore.cpp src/plugins/cpptools/cppmodelmanager.cpp src/plugins/fakevim/fakevimhandler.cpp src/plugins/find/ifindfilter.cpp src/plugins/projectexplorer/buildstep.cpp src/plugins/projectexplorer/devicesupport/idevice.cpp src/plugins/projectexplorer/runconfiguration.cpp src/plugins/vcsbase/vcsbaseeditor.cpp tests/system/suite_debugger/tst_simple_analyze/test.py Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
| * Doc: edit utils docsLeena Miettinen2013-09-091-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \a for all attributes in function descriptions to avoid QDoc errors. Do not use \param, because it is not a valid QDoc command. Do not use \returns as it does not exist. Do not use \brief for functions. It is not obligatory, so rather than add them for all functions, let's consistenly leave them out. Fix typos, grammar and style issues, and punctuation. Change-Id: Ib8f296f93976265bb93dbeab40c5b47156518122 Reviewed-by: hjk <hjk121@nokiamail.com>
* | zeroconf: fixing comparison errorFawzi Mohamed2013-09-111-1/+1
|/ | | | | Change-Id: I0e39f8d1741a4ffa56a79456fb47b6af31d27808 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* update qbs filesJoerg Bornemann2013-06-201-2/+2
| | | | | | | Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-201-5/+6
| | | | | | | | | QDoc does some magic with the \class and \namespaces and \brief commands, so the following wording must be used: "The xxx class yyy ..." Change-Id: Id231f30e8464898b776888d5423523de404aae34 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: Remove \fn lines adjacent to functionsOrgad Shaneh2013-06-051-2/+0
| | | | | | | They are unneeded, some of them are unmaintained Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-281-1/+0
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/analyzerbase/analyzerbase.qbs src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qt4projectmanager/qt4projectmanager.qbs Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
| * Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-271-1/+0
| | | | | | | | | | | | | | These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-081-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidrunner.cpp src/plugins/clearcase/clearcasesync.cpp src/plugins/fakevim/fakevimhandler.cpp tests/auto/ioutils/ioutils.pro Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
| * Remove unneeded typedefsKai Koehne2013-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | Fix gcc 4.8.0 warnings like warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not used [-Wunused-local-typedefs] Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-2/+0
| | | | | | | | | | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | make library and plugin dependencies declarativeOswald Buddenhagen2013-04-032-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | instead of directly including the respective pri files in *_dependencies.pri, set variables and let qtcreator.pri resolve them to includes. this will allow us to re-use the dependency info elsewhere. Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-1/+0
| | | | | | | | | | Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | remove unnecessary include pathsOswald Buddenhagen2013-04-021-2/+0
| | | | | | | | | | | | | | | | the #include statements are supposed to be written in a way that makes these unnecessary. Change-Id: I6c9c0c3b00377cb8438036c96e5321ffd493523f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-1/+0
| | | | | | | | | | Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | factor out all library dependencies to _dependencies.pri filesOswald Buddenhagen2013-04-022-0/+1
|/ | | | | | | | this makes it uniform for all libraries Change-Id: I7a7665a2c74c8f212248c0400de04ca3eed1440a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix wrong usage of Properties blocks in qbs files.Christian Kandeler2013-03-151-11/+14
| | | | | | | | A property set on the product level is ignored if the same property is also set in a Properties block whose condition matches. Change-Id: I9248d735977e3d8ff8f1836fd80a49f3c8839bdc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* UI text: fixed zeroconf textLeena Miettinen2013-02-081-3/+3
| | | | | | | Fixed capitalization and punctualization of error messages. Change-Id: I58918b7657d3371c80cc66de142007fb52b95951 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* zeroconf/dnssd_clientstub: avoid possible null dereferencingRobert Loehning2013-02-061-3/+5
| | | | | | | Moved check for NULL-pointer earlier Change-Id: I764bd3c6c0545e7fa0784327375cdf7d06b29a31 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-318-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-298-8/+8
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * Fix memory leak when sdRef is nullMontel Laurent2013-01-211-2/+2
| | | | | | | | | | Change-Id: I903683e5d91d96f43bf88b571fac2f2d18f07e25 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-162-2/+2
| | | | | | | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
* | zeroconf: Fix compiler warningOrgad Shaneh2013-01-141-1/+3
| | | | | | | | | | | | | | dereferencing type-punned pointer will break strict-aliasing rules Change-Id: Id2c66cfcd12dcecc678e6446e8500634cc5babf3 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-082-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Zeroconf: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-115-11/+11
| | | | | | | | | | Change-Id: If23da8a3ae819875c627d40375b908eb0ea73e3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-058-170/+162
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-058-170/+162
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-6/+1
| | | | | | | | | | | | | | Avoid using "." as includePath when it is unneeded Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-042-8/+8
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: dist/gdb/Makefile.osx src/libs/qmldebug/qmldebug.qbs src/plugins/android/androidsettingswidget.cpp Change-Id: I85627130b575f7d08f416dea52031fa72019b217
| * UI text: make zeroconf error message clearerLeena Miettinen2012-10-011-2/+2
| | | | | | | | | | | | | | Fix typo. Change-Id: Iee76e5f7a0c09d4e1d0f7c08a8c80f5bad9e5109 Reviewed-by: hjk <qthjk@ovi.com>
| * UI text: fix capitalization and punctuation.Leena Miettinen2012-10-011-6/+6
| | | | | | | | | | Change-Id: Ib0dfa00b827830365ce4482b14da3668bcadd142 Reviewed-by: hjk <qthjk@ovi.com>
* | qbs files: Sort filesOrgad Shaneh2012-10-031-7/+7
| | | | | | | | | | Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-09-271-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h share/qtcreator/qml/qmlpuppet/commands/tokencommand.h share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp src/plugins/git/gitsettings.cpp tests/manual/ssh/remoteprocess/remoteprocesstest.h Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
| * Fix qbs build with MSVCOrgad Shaneh2012-09-271-0/+2
| | | | | | | | | | Change-Id: Ifd6ef279c09d9ec4fb08333b3e9aad8211e42a5e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Do not use the fromAscii() and toAscii() functions.Christian Kandeler2012-09-211-1/+1
|/ | | | | | | | | | They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In Qt 5, these always do the same thing as their "Ascii" counterparts. The same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not been set, which it hasn't. Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix qbs build for Qt 5.Christian Kandeler2012-09-171-2/+1
| | | | | | | Make sure newly deprecated stuff is still available. Change-Id: I9ebdfcd9a5ecee125a3c73f5f3254ae319d8b282 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix warningsOrgad Shaneh2012-09-172-0/+4
| | | | | | | | | | | | Warnings came up using MinGW 4.4: * botan.cpp: integer constant is too large for 'long' type * dnssd_clientlib.c, dnssd_clientstub.c: ignoring #pragma warning * hostutils.cpp: comparison between signed and unsigned integer expressions * qmakebuildins.cpp: 'QString windowsErrorCode()' defined but not used Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* zeroconf: Compile fix for MinGWChristian Stenger2012-08-312-21/+25
| | | | | Change-Id: I08120e945fea6455ea109926b9b0a95406d078da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix warningOrgad Shaneh2012-08-151-1/+1
| | | | | | | | | | | | MainConnection inherits ErrorLogger, which contains a virtual function /usr/include/qt4/QtCore/qsharedpointer_impl.h:342:21: warning: deleting object of polymorphic class type ‘ZeroConf::Internal::MainConnection’ which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] Change-Id: I6e0a698da8f1b7024eae24167078b51e8921a435 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: hjk <qthjk@ovi.com>
* Fixes in translated stringsRobert Loehning2012-08-011-2/+3
| | | | | Change-Id: I4b554d925102fcd7c503276c1e085e8f438b0e3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* tr()-Fixes for 2.6.Friedemann Kleint2012-07-301-1/+1
| | | | | | | | | | - Fix typo. - Fix invalid usage of tr() in ServiceBrowser. - Remove plural form in Debugger. - Give ElfReader a proper tr()-context. Change-Id: Id3172f0e093fd5fbe328061d32d2ba7fcfebaca7 Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
View Lorry Controller Status