feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
58,335 Commits 108 Branches 368 Tags
90bc1c91daf2a17de1a5f0da223488583d8bf7dc
Commit Graph

28 Commits

Author SHA1 Message Date
Nikolai Kosjar
eeb566ef74 CppTools: Update known doxygen commands 
...from https://www.stack.nl/~dimitri/doxygen/manual/commands.html

/*!
 * New doxygen that are highlighted and completed:
 * \authors
 * \callergraph
 * \category
 * \cite
 * \copybrief
 * \copydetails
 * \copyright
 * \details
 * \diafile
 * \dir
 * \docbookonly
 * \enddocbookonly
 * \endinternal
 * \endmsc
 * \endparblock
 * \endrtfonly
 * \endsecreflist
 * \enduml
 * \extends
 * \hidecallergraph
 * \hidecallgraph
 * \idlexcept
 * \implements
 * \includelineno
 * \latexinclude
 * \memberof
 * \msc
 * \mscfile
 * \parblock
 * \private
 * \privatesection
 * \protected
 * \protectedsection
 * \protocol
 * \public
 * \publicsection
 * \pure
 * \refitem
 * \related
 * \relatedalso
 * \remark
 * \result
 * \rtfonly
 * \secreflist
 * \startuml
 * \subpage
 * \tparam
 * \vhdlflow
 */

Task-number: QTCREATORBUG-10145
Change-Id: I7cc3ff0d6d58bbd188ca8056302fda790dcbf0ce
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-03-31 11:46:01 +00:00
Nikolai Kosjar
ed168b2e05 CppTools: Update known qdoc commands 
...from http://doc-snapshots.qt.io/qt5-5.7/27-qdoc-commands-alphabetical.html

/*!
 * New qdoc that are highlighted and completed:
 * \annotatedlist
 * \default
 * \div
 * \inherits
 * \inqmlmodule
 * \instantiates
 * \noautolist
 * \qmlabstract
 * \qmlattachedproperty
 * \qmlattachedsignal
 * \qmlbasictype
 * \qmlclass
 * \qmlmethod
 * \qmlmodule
 * \qmlproperty
 * \qmlsignal
 * \qmltype
 * \span
 * \uicontrol
 */

Change-Id: I55b8e83814a6008b6580a6e50ca780b257d4197b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-03-31 11:45:53 +00:00
Nikolai Kosjar
24640a6e4e CppTools: Sort doxygen commands 
We will update them, so having them sorted is better for finding
duplicates.

Change-Id: I1159ed1f1fce1275d630935a297e85787947ba61
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-03-31 11:45:46 +00:00
Nikolai Kosjar
6ed1a2b3c8 CppTools: Rewrite cppdoxygen.cpp with cplusplus-keywordgen 
Braces all over the place since the tool does not respect the coding
style and cppdoxygen.cpp was changed with regard to the braces coding
style in the meantime:

  commit 29a93998df
  Remove braces for single lines of conditions

Next step is to use the tool for updating the qdoc/doxygen keywords.

Change-Id: Ib95b5991ebd794d144848ae052fa7f28a6d10850
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-03-31 11:45:39 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
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
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/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>
 2013-01-08 10:48:18 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Roberto Raggi
48739839e4 Improved qdoc support. 2009-02-20 14:55:28 +01:00
Roberto Raggi
e67b2453c8 Added support for some qdoc tags. 2009-02-20 13:52:24 +01:00
Roberto Raggi
a976385b44 Code completion of doxygen tags. 2009-02-20 12:55:18 +01:00