feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
29,689 Commits 108 Branches 368 Tags
45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f
Commit Graph

47 Commits

Author SHA1 Message Date
Oswald Buddenhagen
7923032022 fix include style relating to cplusplus libraries 
... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-03 13:40:39 +02: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
hjk
140b502903 C++: Highlight argument to gcc's #include_next extension properly 
Change-Id: I90097e11689fbbb964fc4344a1e3ba60c718a1cf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-04 17:50:29 +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
hjk
6a7cf405bd rename QtDebug to QDebug 
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-06 14:55:08 +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
Leandro Melo
4557d586f6 C++: Initialize member 
Change-Id: Ifb708cb875aa1403de66a4c3302f70e0d1b4d2ac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-28 13:50:28 +02: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
Leandro Melo
64d579dc3a C++: Enabled C++0x in SimpleLexer 
We should create a UI flag for C++0x...

Change-Id: Iba30090aa580554af629c0fb59ae5fc22b306b80
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-11-18 12:14:24 +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
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
Erik Verbruggen
9c321dc7c8 More completion fixes. 2010-07-06 13:11:27 +02:00
Erik Verbruggen
69a74abf26 Fixed completion for doxygen comments. 2010-07-06 10:57:56 +02:00
Christian Kamm
837e7b5abd C++: Remember joined state in SimpleLexer. 
Done-with: Erik Verbruggen
 2010-07-02 15:47:00 +02:00
Erik Verbruggen
8e4fb678fd Removing SimpleToken 2010-07-02 11:18:51 +02:00
Erik Verbruggen
e3e8b1a5c0 Removed the TokenCache. 2010-07-02 11:18:51 +02:00
Erik Verbruggen
e42ca194c5 Introduced token caching to prevent repetetive tokenizing. 
Also removed TokenUnderCursor as it's functionality is in the token cache.

Reviewed-by: ckamm
 2010-06-14 10:10:05 +02:00
Erik Verbruggen
2f0e30c150 Fixed #import completion to act the same as #include completion. 2010-03-23 16:06:25 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Erik Verbruggen
8de6ccc775 Revert "Split Objective-C keyword parsing to handle the '@' separately." 
This reverts commit 2a59d2ae0c.
 2010-02-15 12:24:31 +01:00
Erik Verbruggen
2a59d2ae0c Split Objective-C keyword parsing to handle the '@' separately. 
Because apparently, while designing the Objective-C language, somebody
thought it was a world-class idea to allow any white-space between the
'@' character and the subsequent keyword. With this fix, we now
correctly parse:
    @  dynamic
and:
    @
      selector
and:
    @"foo"
     "bar"
    @"mooze"
(This last one is 1 single string split over multiple lines.)
Wonderful, isn't it?

What we (and Clang) do not support, but what GCC supports is something
like:
   @"foo"@@  "bar"  @"mooze"  @@
which is equivalent to @"foobarmooze".
 2010-02-15 09:27:00 +01:00
Erik Verbruggen
cdd8ac099d Renamed method. 2010-02-04 10:59:23 +01:00
Tobias Hunger
df2a2dc118 Small inclusion fixes. 
* Remove duplicate headers.
 * Move own headers to the top.

Reviewed-by: Roberto Raggi
 2010-01-08 15:48:32 +01:00
Erik Verbruggen
d61eb9c893 Syntax highlighting for Objective-C identifiers (super, self, nil, Nil, _cmd, SEL, IMP, BOOL, YES, NO, id). 2009-10-09 15:23:19 +02:00
Roberto Raggi
e40cd82f8c Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments and improved CPPEditor::isInComment to handle the newly introduced tokens. 
As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
 2009-09-29 11:35:43 +02:00
Roberto Raggi
a49395a0ea Made the indenter more Qt friendly. Added support for moc keywords. 2009-09-21 16:10:17 +02:00
Roberto Raggi
6c9670c3db Use the backward scanner to indent labeled statements, ctor-initializers and access specifiers. 2009-09-21 15:14:28 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Thiago Macieira
d0457b70e3 Compile the C++ parser library with Sun CC 5.9. 
Things you mustn't do:
1) end an enum with a comma

2) #include <cxxxx> and not use std::

3) use anonymous structures

All three things are invalid C++. Anonymous structures inside
anonymous unions are allowed by GCC, but that doesn't mean it's valid.
 2009-08-03 14:59:42 +02:00
Roberto Raggi
e9d0285fbc Oops! operators are not objc keywords :) 2009-07-13 12:28:22 +02:00
Roberto Raggi
1eefd16383 Fixed a few typos and bugs in the ObjC++ support. 2009-07-13 12:05:29 +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
4c5ff047f0 Initial support for doxygen comments. 2009-02-20 11:52:27 +01:00
Roberto Raggi
56b48c2362 Fixes: Enable ObjC support. 2009-02-05 14:30:24 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
Roberto Raggi
599cdcfa06 More ObjC++ 2009-01-09 16:55:51 +01:00
Roberto Raggi
b2ff63145b Added objcEnabled()/setObjcEnabled() to SimpleLexer. 2009-01-08 12:56:07 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00