feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,391 Commits 108 Branches 368 Tags
3e9105e40150a413b65d21588a468e7914697bcc
Commit Graph

29 Commits

Author SHA1 Message Date
Francois Ferrand
3e9105e401 Preprocessor: fix handling of first empty argument. 
First empty argument used to be dropped: e.g. MACRO(,test) would be
expanded with one parameter only, with value 'test'.

Change-Id: I693fbb7faf1360f62266fa04c4b39c2de0d159a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-19 10:33:14 +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
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +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
Leandro Melo
19b1a06ec8 C++: Handle multi-line if/elif directives 
Task-number: QTCREATORBUG-5843

Change-Id: Ie32ed9daadf70f3b972a96fb53edcde9b1debb6c
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-31 11:52:39 +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
hjk
57eae3191e s:// end of namespace :// namespace :g for consistency 
We use the latter style everywhere else to signify the end of a namespace block.
 2011-02-04 12:45:32 +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
Roberto Raggi
0a3bfc24f8 Improved the expansion of variadic macros. 2010-09-01 17:10:39 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
Roberto Raggi
f829ef899c Store in the document's macroUsages only the top-level macro expansions. 2009-10-15 16:25:10 +02:00
Christian Kamm
22ed0255b9 Track more macro uses. 
In particular macros that are only checked for definition or are
expanded during the evaluation of an #if or #elif directive are now also
added to the list available through Document::macroUses().

The names of undefined macros that are interesting (because they're used
in an #ifdef or a defined(...)) are now available through
Document::undefinedMacroUses().

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2009-09-25 16:08:01 +02: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
Roberto Raggi
bdf6c3d0be Store the encoded file name in a QString. 2009-05-27 15:34:13 +02:00
Roberto Raggi
a0667d5952 Obsoleted code. 2009-03-03 10:49:14 +01:00
Roberto Raggi
454438e47d More cleanup. 2009-03-03 10:41:20 +01:00
Roberto Raggi
ebe17889f4 Some refactoring of the preprocessor, it'll simplify my next commits. 2009-03-02 19:03:07 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
Roberto Raggi
0422bcbbd5 Some more clean up in the preprocessor. 2008-12-22 14:10:47 +01:00
Roberto Raggi
e325aa38d9 Nicer implementation of CPlusPlus::Macro. 2008-12-22 13:55:42 +01:00
Roberto Raggi
753ddb7ce0 Some cleanup in the C++ preprocessor. 
Introduced pp-scanner.cpp, renamed `pp' to `Preprocessor' and removed useless #includes.
 2008-12-22 11:40:53 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Roberto Raggi
9653f4b7e9 Fixed macro locations. 2008-12-09 16:20:21 +01:00
Roberto Raggi
f6fbb274ae Moved the preprocessor. 2008-12-08 12:24:40 +01:00