feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,484 Commits 108 Branches 368 Tags
1fda2111d468a08b72894e0dbc63dfec46f97ab8
Commit Graph

60 Commits

Author SHA1 Message Date
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
Francois Ferrand
5e8c3f4be7 C++: fix constructor definition parsing. 
When a constructor is defined with a single, unnamed argument of a custom type without
extra type specifiers (const...), then the constructor was not identified as such.
There was an heuristic in case the constructor was in the class definition, but not if the
the constructor was defined later.

Examples:

class Arg;
class Other;

class Foo {
  Foo(Arg /*arg*/);               // working
  Foo(const Arg /*arg*/);         // working
  Foo(int /*arg*/);               // working
  Foo(Other /*arg*/)         {}   // working
};

Foo::Foo(Arg /*arg*/)        {}   // used not to work, fixed
Foo::Foo(Arg arg){}               // working
Foo::Foo(const Arg /*arg*/)  {}   // working
Foo::Foo(int arg)            {}   // working

Change-Id: I741e4ba62672ddc99a837fdcdc27996fba5ae6c7
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 13:36:43 +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
Erik Verbruggen
275e207d26 Fix invalid decltype error recovery which resulted in crashes. 
Task-number: QTCREATORBUG-7174

Change-Id: I653db71adc45586cd8518ffd96118425fd3763be
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-28 13:41:48 +02:00
Erik Verbruggen
a621c99a0f [C++] Add error recovery for namespace declarations. 
Change-Id: I884ff9901c95467524e5eba38e91f75992d30e14
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Flex Ferrum <flexferrum@gmail.com>
 2012-02-28 10:22:31 +01:00
Erik Verbruggen
368d5926ca C++: handle destructor names with template parameters. 
Change-Id: I74b4fd5e043db935abc18345b303d294b71e8fc2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-02-23 08:39:34 +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
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Bill King
3593fe08ae tests: add licence headers 2011-02-18 14:48:16 +01:00
Bill King
853b16ccee Tests: cleanup output so that it appears inline with associated test. 2011-02-17 16:08:42 +01:00
Erik Verbruggen
7334ed9ec4 C++: fixed translatable quick-fix strings. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
192ca70649 C++ Parser: fix infinite loop when recovering from incorrect @selector expression. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
3edb0a8480 C++: Added unittest for 5a1924f1a0. 2010-09-16 11:31:07 +02:00
Bill King
1f0b600b82 Autotests: More cleanup of tests, and initial marking of components belonged to. 2010-09-02 15:32:04 +10:00
Roberto Raggi
688d382ad9 Some cleanup in the C++ AST. 2010-08-26 16:07:14 +02:00
Roberto Raggi
2ebaf3fe5b Get rid of the #warning directives. 2010-08-11 15:48:40 +02:00
Roberto Raggi
6324bf4460 Introduced IdExpressionAST. 2010-08-02 12:52:12 +02:00
Erik Verbruggen
112b713343 Fixed test after changing the AST representation of the postfix expression. 2010-06-25 13:20:24 +02:00
Erik Verbruggen
e609e9a701 Simplified ObjC selectors in the AST. 2010-02-23 17:43:52 +01:00
Erik Verbruggen
a0071f1ce9 Revert "Added Objective-C @try block parsing." 
This reverts commit f4163b8ba0.
 2010-02-15 12:24:31 +01:00
Erik Verbruggen
f4163b8ba0 Added Objective-C @try block parsing. 2010-02-15 09:27:01 +01:00
Erik Verbruggen
21488e8898 Added semantic checks for Q_ENUMS. 2010-02-07 10:49:03 +01:00
Erik Verbruggen
a3d0406d31 Fixed throw expression parsing. 2010-02-02 15:39:42 +01:00
Erik Verbruggen
c33b55537d Extended operator precedence parsing. 
It now includes comma expressions, conditionals and assignment
expressions.
 2010-02-02 12:34:57 +01:00
Erik Verbruggen
0cf0becb2e Added AST building for __attribute__ constructs. 2010-02-02 12:03:37 +01:00
Erik Verbruggen
3dd011fcb6 Changed binary expression parsing to use precedence parsing. 2010-01-28 15:22:50 +01:00
Roberto Raggi
75a7abb8c5 Compile. 2009-12-02 12:45:28 +01:00
Erik Verbruggen
72d4493fc2 Added scope calculation for Objective-C classes. 2009-11-11 09:21:06 +01:00
Roberto Raggi
0ae2d96a9b Fixed the AST field names. 2009-11-10 16:47:16 +01:00
Roberto Raggi
e5eb88a31f Ported the accept methods. 2009-11-10 16:20:13 +01:00
Roberto Raggi
cdb1443219 Cleanup specifiers. 2009-11-10 16:20:13 +01:00
Roberto Raggi
4fc2ccf0c5 Cleanup ptr operators. 2009-11-10 16:20:13 +01:00
Roberto Raggi
24b6c858eb Cleanup postfix declarators. 2009-11-10 16:20:12 +01:00
Roberto Raggi
a7219736b6 Cleanup Postfix operators. 2009-11-10 16:20:12 +01:00
Roberto Raggi
1dbdbbefe7 Cleanup base base specifiers. 2009-11-10 16:20:11 +01:00
Roberto Raggi
77e7899e7c Removed StatementListAST 
Done with Erik Verbruggen
 2009-11-10 16:20:09 +01:00
Roberto Raggi
36a0ea2bcb Removed DeclarationListAST node. 
Done with Erik Verbruggen
 2009-11-10 16:20:09 +01:00
Roberto Raggi
1dd6c64246 More tests for template-ids. 2009-10-20 15:29:58 +02:00
Roberto Raggi
3ec7f9d389 Added tests for the new regressions in the C++ parser. 2009-10-20 11:27:40 +02:00
Roberto Raggi
13675cf6ed Cleanup the C++ front-end. 
Removed CPLUSPLUS_BEGIN/END_NAMESPACE & co and made it possible to compile the parser with CPLUSPLUS_WITHOUT_QT.
 2009-10-20 11:21:25 +02:00
Roberto Raggi
fe2c9cc16d Improved parsing of ambiguous statements. 
Done with Erik Verbruggen
 2009-10-19 17:48:57 +02:00
Erik Verbruggen
077c19a661 Fix for invalid parsing of "(a)[b]", including test cases. 2009-10-19 14:50:20 +02:00
Roberto Raggi
20545fd4b1 Fixed more template-id vs expressions ambiguites. 2009-06-19 12:39:32 +02:00
Roberto Raggi
b4a27f6995 Added test tst_AST::condition_1() 2009-06-19 11:23:30 +02:00
Roberto Raggi
e6d0f2ca0c Fixed the auto tests. 2009-06-19 11:19:56 +02:00