feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
24,652 Commits 108 Branches 368 Tags
24f24c4546c90924faf349daec65c7a754fee61d
Commit Graph

251 Commits

Author SHA1 Message Date
Oswald Buddenhagen
24f24c4546 factor QMakeGlobals into an own file 
Change-Id: I55d24be06fa78f70bad614a7125c3079c92ab8e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:04:47 +02:00
Oswald Buddenhagen
37b2f88e27 ProFileOption => QMakeGlobals 
more accurate class name

Change-Id: I4258b221727e79cc88d5f57dd1f6631ba0bba625
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:04:29 +02:00
Oswald Buddenhagen
00ec7f5e70 ProFileEvaluator::Private needs no q pointer 
Change-Id: I946f3ebe9fde342fed4648cbbf0d0872d48572da
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:03:20 +02:00
Oswald Buddenhagen
171531fcc9 evaluate default_pre per subproject 
qt5 qmake does it

Change-Id: I95cab3f6d87e4baf74e1363404fae94ca3a08eec
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-04 12:02:55 +02:00
Oswald Buddenhagen
087021a23c add some future safety 
detaching an empty vector does not necessarily do anything.
on the downsite, as the sentinel value is not empty any more, we need to
explicitly clear it out when we meet it.

Change-Id: I0f15aa3d421706a5423bf37f3173a807d0d49c53
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-04 12:01:37 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9 
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-30 14:32:08 +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
Oswald Buddenhagen
555e539760 make $$join() implementation qmake-compliant 
Task-number: QTCREATORBUG-6441

Change-Id: I1d18c81f76cda71654a85c23b7b53b4aae0d51c6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-15 16:28:55 +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
Daniel Teske
e7c6b9dbbb Make sysrootify case-insensitive on windows 
Task-Number: QTCREATORBUG-6419

Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-02 18:10:37 +01:00
Robert Loehning
75719f04ee Removed dead assignments 
Change-Id: I1368cb534284016479211160cd8bf3cbc2f738e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-21 21:17:08 +02:00
Oswald Buddenhagen
7cd17f3f41 fix access to free()d memory 
the 'item' reference may become invalid inside the loop.

Change-Id: I4468b1dc67e565e2eb8ce35268ef44b18142846a
Reviewed-on: http://codereview.qt.nokia.com/1703
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-07-15 17:48:35 +02:00
Oswald Buddenhagen
330e118424 implement qt5 $$sort_depends() and $$resolve_depends() 
Task-number: QTCREATORBUG-5289

Change-Id: I15e08005c13d12afd5791796d676b30c726fadc3
Reviewed-on: http://codereview.qt.nokia.com/1464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-13 16:27:26 +02:00
Oswald Buddenhagen
ddb918f1bb fix whitespace 
Change-Id: I430cb68948e7c3dab108e88b28d0bc53796c6a0a
Reviewed-on: http://codereview.qt.nokia.com/315
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-06-01 17:16:02 +02:00
Oswald Buddenhagen
3cb595fa34 add ProFileOption::initProperties() 
centralize support for default-initialization of qmake properties with,
duh, qmake (-query).

Change-Id: If97725fa61779819f6afb9073042b667d7253e5d
Reviewed-on: http://codereview.qt.nokia.com/308
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-01 16:43:51 +02:00
Oswald Buddenhagen
b0d764cf95 make cumulative mode support in ProFileEvaluator optional 
just in case it gets used for something "real" ...

making exact mode optional would make no sense, as feature files always
need to be evaluated exactly for meaningful results.

Change-Id: I568ab751cf74790e0f79b54248202412c39a68ea
Reviewed-on: http://codereview.qt.nokia.com/306
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-01 16:43:35 +02:00
Oswald Buddenhagen
014571b602 improve value source tracking 
- use the current file if a value is generated "out of nowhere"
- preserve source through function calls

Task-number: QTCREATORBUG-4897
 2011-05-16 10:28:04 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christian Kandeler
e751a135db Project File Parsing: Add support for new "aux" template. 
Reviewed-by: dt
 2011-05-05 17:44:27 +02:00
Oswald Buddenhagen
8a9cbffea6 use environment from build config also when starting external processes 
this uses QProcessEnvironment directly, which is somewhat inefficient,
but it has no big impact, and it can be optimized on the qt side.

Task-number: QTCREATORBUG-2866
 2011-04-21 11:38:23 +02:00
Oswald Buddenhagen
4e91de7991 use QProcess in profile evaluator if not bootstrapped 
this avoids the nasty console popups under windows

Task-number: QTCREATORBUG-1788
 2011-04-21 11:38:23 +02:00
Oswald Buddenhagen
bff02614db fix return statement in #if 0'd code 2011-04-21 11:38:23 +02:00
Oswald Buddenhagen
dd0203e921 use environment from build configuration in the project evaluator 
Task-number: QTCREATORBUG-2866
 2011-04-20 21:23:23 +02:00
Oswald Buddenhagen
5e23cf2968 eliminate m_filevaluemap by using source tagging 
instead of having a second value map per included file, simply tag all
values with the project file they are coming from. a lot cleaner and
marginally faster.
 2011-04-20 19:44:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Oswald Buddenhagen
17740d2ec3 continue parsing line despite errors 
as far as possible, anyway. and suppress messages after the first one.
this avoids that scope nesting gets thrown off and thus spurious
followup-errors crop up.

as a "side effect", this fixes a crash resulting from us rewinding the
token stream but ignoring the block stack on the way.

Task-number: QTCREATORBUG-4368
 2011-04-06 21:36:04 +02:00
Oswald Buddenhagen
6b8eb847c4 fix crash when evalError() is called before a block is started 
would happen if a qt installation simply disappeared and the qt version
manager didn't notice it yet.
 2011-03-21 15:45:58 +01:00
Oswald Buddenhagen
5eb220b506 sync host & target mode determination with qmake 
they are dynamically determined from the qmakespec now.

Task-number: QTCREATORBUG-3512
 2011-03-18 21:28:04 +01:00
Oswald Buddenhagen
08deb39072 more exact qmake command line parsing 
support -after and -config.
this also moves the actual parsing to ProFileOption, where it belongs.
 2011-03-18 21:28:04 +01:00
Oswald Buddenhagen
16436a252b move command line args from ProFileEvaluator to ProFileOption 2011-03-18 21:28:04 +01:00
Oswald Buddenhagen
2e22ba59d9 recognize backslashes when evaluating a feature file's relativity 
this is an utterly irrelevant non-feature, but whatever.
 2011-03-18 21:28:04 +01:00
Oswald Buddenhagen
b83d730322 use proper enum value instead of number for unknown functions 
silences compiler warnings
 2011-03-16 12:24:37 +01:00
Oswald Buddenhagen
e77c2f5a8b don't give up on parsing errors 
instead of erroring out the parse, only error out the evaluation in
exact mode. that way we can do cumulative evaluation even on broken
files.

Task-number: QTCREATORBUG-3093
 2011-02-10 14:56:15 +01:00
Oswald Buddenhagen
31e7e7c353 don't claim success in some failure cases 
this kinda worked because int(ReturnTrue) == int(true), but there
are more possible return values than that.
 2011-02-10 14:56:15 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
53d41cb84b Project file evaluation: Take sysroot into account. 
Task-number: QTCREATORBUG-1858
Reviewed-by: Oswald Buddenhagen
 2011-01-05 17:58:21 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Christian Kandeler
79c95e4603 Qt project file parsing: Take target options into account. 
Reviewed-by: Oswald Buddenhagen
Reviewed-by: kh1
Reviewed-by: dt
 2010-11-17 17:36:05 +01:00
Oswald Buddenhagen
8e993e08e6 fix one more raw data leak 
again, qregexp was putting our raw string into its cache - this time
hidden behind a qdir::entrylist().

Reviewed-by: dt
Task-number: QTCREATORBUG-2758
 2010-10-21 20:02:08 +02:00
Oswald Buddenhagen
7322900692 make ProFileParser API less bug-prone 
QString::isNull() vs. isEmpty() discrimination is a time bomb ...
 2010-09-02 18:08:22 +02:00
Oswald Buddenhagen
34a8a57d81 fix crash when no command line options are passed to qmake 
the root cause is in the API of parsedProFile(): it discerns
isNull() and isEmpty(), which is of course a time bomb.
but in this case the right solution is not trying to parse
the empty string in the first place.
 2010-09-02 18:08:22 +02:00
dt
9f68456b65 Give our Profile parser more information from the qmakestep 
e.g. DEFINES+=bla on the qmakestep command line now work

Task-Nr: QTCREATORBUG-2091
 2010-09-01 12:37:29 +02:00
Oswald Buddenhagen
1fd8672e40 don't crash during setup without valid qt configuration 
there is not much point in complaining about internal queries of unknown
properties anyway, so just don't try it.
remove the default value from the complain argument to avoid mistakes
either way in the future.
 2010-06-25 12:11:56 +02:00
Oswald Buddenhagen
866b5c7315 whitespace-trim test names inside if() 2010-06-24 20:01:48 +02:00
Oswald Buddenhagen
04bee3be57 change the way how loading of configs & features is controlled 
make it an argument of the main entry point instead of a property
 2010-06-24 18:57:50 +02:00
Oswald Buddenhagen
4c74b0b973 fix crash on querying an unexistant property from the outside 2010-06-24 18:57:50 +02:00
Oswald Buddenhagen
120641359a set output dir in evaluateFileInto() 
that's consistent with qmake, but without practical relevance.
 2010-06-24 15:44:37 +02:00
Oswald Buddenhagen
4cd0281f63 assignment-related crash fix 
when appending a list with one empty element to an empty list, we'd get
into a state which would subsequently cause an assert.
 2010-06-24 15:44:37 +02:00