feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
2,819 Commits 108 Branches 368 Tags
36a94b69b12e458a99b12067e8220f541fcdeb39
Commit Graph

131 Commits

Author SHA1 Message Date
con
a1e4421657 Build fix for non-webkit build. 2009-05-08 10:00:19 +02:00
hjk
71a05578ae compile fix for namespaced Qt 2009-05-07 15:57:37 +02:00
Friedemann Kleint
14e39ba5af Fixed translation issues. 2009-05-07 15:34:52 +02:00
Friedemann Kleint
2f129dfad3 Fixed some translation errors. 2009-04-30 16:09:57 +02:00
Roberto Raggi
1a1b841cdb Fixed parsing of ambiguous name ids. 2009-04-28 19:02:28 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
con
412a4b027d Merge commit 'origin/1.1' 
Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/gdboptionpage.ui
 2009-04-17 15:17:31 +02:00
Oswald Buddenhagen
923db1ce6d less convoluted 2009-04-16 15:36:26 +02:00
Oswald Buddenhagen
1356d8c20a whoops 
newlines are like whitespace, so items don't run together
 2009-04-16 15:36:26 +02:00
Thorbjørn Lindeijer
bc89f5dc4f Merge branch '1.1' 
Conflicts:
	src/plugins/debugger/debuggeractions.cpp

Reviewed-by: hjk
 2009-04-16 11:32:05 +02:00
Oswald Buddenhagen
cc09453cb1 make quote/escape parsing more qmake-compatible 2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
031c7c1658 QT_NO_CAST_FROM_ASCII safety 2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
870a3b3903 protect against circular inclusion of pro/pri files 
Task-number: 250574
 2009-04-15 20:35:58 +02:00
Oswald Buddenhagen
99fccb6d37 do not crash on lines starting with an equal sign 2009-04-15 20:35:58 +02:00
con
814b36f2ff Sorry, still can't embed videos, crashes too often. 2009-04-09 12:44:12 +02:00
Oswald Buddenhagen
e6843ff5bc Merge commit 'origin/1.1' 2009-04-09 12:04:50 +02:00
Olli Werwolff
7b84e0c91b Fixes: Changes in skipping files and suggested path in qrc editor 
RevBy:    Thorbjorn Lindeijer
Details:  Renamed button "Don't Add" to "Skip". The button is only
          shown, if more than 1 file shall be added. In addition to
	  that the qrc editor checks, whether there is a "Resources"
	  directory in the qrc-file's folder and sets this directory
	  as the suggested save dir, if present (Needed in the Visual
	  Studio Add-in)
 2009-04-09 11:57:27 +02:00
Friedemann Kleint
472e25025f Start on the German (prototypical) translation. 2009-04-08 16:35:56 +02:00
Thorbjørn Lindeijer
8d774b19cd Code style fixes 
Removed "void" from functions that take no parameters, removed a few
"get" prefixes, etc.
 2009-04-08 15:13:17 +02:00
Oswald Buddenhagen
4bece54f34 re-initialize some variables for each file 
merge 3570e978058816745101a69b552ad9d07e349542 and
00f2031c60bc472544b509586ee31c643ab2e81d from qt.
 2009-04-06 11:11:42 +02:00
Roberto Raggi
d9812ac32c Fixed the signature of Symbol::getPosition() & co. 2009-03-31 14:46:46 +02:00
Roberto Raggi
8f84f81e6d Introduced startOffset(), endOffset(), getPosition(), getStartPosition(), and getEndPosition(). 2009-03-31 13:56:28 +02:00
Roberto Raggi
05d2cd6000 String state does not propagate! 2009-03-31 11:30:57 +02:00
Simon Hausmann
e8f364929f Enable Plugins and JavaScript in the embedded help viewer to make it possible to embed flash videos in the documentation 
Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
 2009-03-30 15:20:17 +02:00
Roberto Raggi
fde8ca4a16 Added Document::ParseDeclarator. 2009-03-30 15:08:21 +02:00
Thorbjørn Lindeijer
5d8ee0d742 Moved some complicated checks into convenience functions 2009-03-26 16:54:20 +01:00
Roberto Raggi
424dd77e18 Added support for Q_SIGNAL and Q_SLOT. 2009-03-25 11:50:17 +01:00
Thorbjørn Lindeijer
ec69936c7c Support Doxygen comment style after members 
Forms /**<, /*!<, ///< and //!<.

Done with Roberto Raggi.
 2009-03-20 14:24:02 +01:00
dt
b3ec859c80 Fixes: Handle debug and release scopes for TARGET and DESTDIR 
Task:     247606
Details:  Remove all the magic which build on top of the cumalative
parser. Instead trust the exact parsing to get those variables correct.
This required a bug fix in the profile evaluator, done with ossi.
Hopefully this doesn't break windows/mac. Will check.
 2009-03-19 15:04:43 +01:00
dt
28dacdfdf3 Fixes: Wrong evaluation of arguments to qmake functions 
Task:     247606
RevBy:    analysis and bug fix mostly by ossi
Details:  More fixes might be needed.
 2009-03-17 17:12:29 +01:00
Roberto Raggi
437bbd00e5 Don't insert `(' when completing ambiguous symbols. 2009-03-17 14:46:35 +01:00
Roberto Raggi
a744a73145 Check for ambigious function-declarators/cpp-initializers. 2009-03-17 14:27:28 +01:00
Roberto Raggi
e3baca2e9a Prefer C++ Initializer when parsing init-declarators. 2009-03-17 14:12:42 +01:00
Roberto Raggi
f9a3df1847 Visit the parameters, the cv qualifiers and exceptions 2009-03-17 14:12:42 +01:00
Oswald Buddenhagen
3670b1a42f remove qt < 4.5 #ifdefs 2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
027b52a25d sync variable expansion and list splitting with qmake 2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
5bc97eb1a0 compile without ascii cast (to be in sync with qt) 2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
9f51e3b72c re-enable $$system() processing 
unlike the conditional variant, the substituting variant may actually
provide interesting output with rather low likelyhood of side effects.
btw, my FIXME was bogus - i confused the two variants.
 2009-03-11 18:40:27 +01:00
Oswald Buddenhagen
a429d7a5e2 blow away the -$VAR hack again, now that things Just Work (TM) 2009-03-11 16:21:00 +01:00
con
7b38d9c8d3 Fixes: - Proparser handling of '=' operator. 
Details:
"CONFIG = foo bar" resulted in "CONFIG = bar"
"CONFIG = foo
CONFIG = bar $$CONFIG"
resulted in "CONFIG = bar bar"
 2009-03-09 15:57:55 +01:00
hjk
dc8045f5be Fixes: fakevim: work on indentation 2009-03-06 13:03:33 +01:00
Roberto Raggi
66a3e71579 Added ASTVisitor::getTokenStartPosition() and ASTVisitor::getTokenEndPosition(). 2009-03-06 10:45:41 +01:00
Roberto Raggi
5e3921d2bd Added a fwd declaration for the class Token. 2009-03-06 10:45:41 +01:00
Roberto Raggi
942f5a708a Ignore the symbol's column for generated symbols (at least for now). 2009-03-04 15:45:38 +01:00
Roberto Raggi
4613da1c8b Mark the generated tokens in the token stream. 2009-03-04 14:36:47 +01:00
Roberto Raggi
3d6f7de909 Context-sensitive highlighting. 2009-03-03 13:57:08 +01:00
Roberto Raggi
ea1d5503a4 Added a bit to annotate the generated tokens. 2009-03-03 11:31:35 +01:00
Roberto Raggi
f96d8ff9e0 Fixed: Parsing of /**/ tokens. 2009-03-02 19:00:57 +01:00
Oswald Buddenhagen
146fb04f2b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-03-02 12:28:32 +01:00
Roberto Raggi
fd22788d9e Improved matching of qdox/doxygen comments. 2009-03-02 10:10:30 +01:00