feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
42,944 Commits 108 Branches 368 Tags
b6fb8da6ff5093f07843948ae4b30aa0c1137441
Commit Graph

73 Commits

Author SHA1 Message Date
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Daniel Teske
765ad6c3d2 Android: Set ANDROID_EXTRA_LIBS scoped to the arch 
The workflow for adding a library for multiple archs is not ideal, but
now a little better. The user has to go to the deploy setting for a
kit per architecture and add the right extra library.

Change-Id: I2bda6961f6f1164bdc58acd78fa3d2221977f0cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-04-01 16:23:10 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Marc Mutz
d3b425c99f qmake: add ProStringList::join(QChar) 
Same reasoning as for 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies.

Adding the overload was easier than to teach a Perl script to distinguish
between QStringList and ProStringList instances...

Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/cbf447069cfeb799ff5e09902be065d77f2e7707)
(cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-17 14:52:53 +02:00
Debao Zhang
fec0a0fcd9 qmake:Add a case sensitivity flag to ProString::{starts,ends}With() 
Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-06 14:52:34 +01:00
Joerg Bornemann
36081d6fdb add base parameter to ProString::toInt and ProString::toShort 
Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-06 14:52:30 +01: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
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02: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
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6' 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
 2012-09-12 17:27:37 +02:00
Oswald Buddenhagen
f53ed6c4b3 don't pretend that break()/next()/return() are functions 
it's a pretty braindead thing to implement control flow statements as
(built-in) functions.

as a "side effect", this fixes return() value handling for lists.

Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-09-12 17:05:20 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +02:00
Oswald Buddenhagen
f24c986530 update size calculations for assignment statements 
this was forgotten when the value lists were extended by a size hint.

Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-07 19:59:04 +02:00
Oswald Buddenhagen
1c28c5df02 fix default arguments of ProString::lastIndexOf() 
Change-Id: If70f4f8e2aa8b68b5c87dbd1b6b95a7601eecce8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-06 14:56:16 +02:00
Oswald Buddenhagen
98afdc9279 compile without CamelCase headers 
for faster bootstrapping of qmake

Change-Id: I602a023f4acbac276219bfc125863749ad96f754
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-03 19:43:49 +02:00
Oswald Buddenhagen
b486c57476 ProStringList is a movable type, so let qt know 
Change-Id: Ib3b632e8fbd484ad20418926398e224fe1549f5b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-03 19:41:22 +02:00
Oswald Buddenhagen
422485c892 add a bunch of ProString::append() overloads 
Change-Id: I9f1f62d8ba57a1bec2c55fe32709b2f6db0f7882
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-03 17:53:21 +02:00
Oswald Buddenhagen
9f8b9eaf16 add ProString::prepend() 
Change-Id: I2dc905470c90eeba15f0f00412405a9a1a2ddcc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-03 17:53:15 +02:00
Oswald Buddenhagen
2db6609556 beef up Pro* APIs 
so they match the Q* counterparts more closely:

ProString: startsWith(), endsWith(), indexOf(), lastIndexOf(),
contains(), at(), length(), QTextStream::operator<<(), toLatin1(),
toInt() & toShort()

ProStringList: length(), removeAt(), contains()

Change-Id: Iab78236f7152f6a4b93709abbf59b9027c44ba2c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-08-28 14:37:28 +02:00
Oswald Buddenhagen
1f2189d5a0 don't pass QLatin1String by ref 
it's pointless

Change-Id: Ia02762a1f79399970cbdf43b3b20e08b4e54fd3b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-08-28 14:36:35 +02:00
Oswald Buddenhagen
85dc06662e simplify ProString::operator==() implementations 
we can trivially construct a QStringRef from a ProString, so take
advantage of that.

Change-Id: I9aaa1f6d910590872b250a145f16e90984beeb94
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-08-28 14:35:55 +02:00
Oswald Buddenhagen
d97de7e43f make ProString c'tors explicit only when not building qmake 
otherwise it's impossible to migrate the qmake generators to this.

Change-Id: I70c848da2ce428706b960c3c1434c26f7e3a9447
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-08-28 14:34:20 +02:00
Joerg Bornemann
edd9279c8a fix release build on Windows with MSVC 
We must work around strange MSVC behaviour when exporting classes
with ProKey members.

Change-Id: I56d56588a52523b1a15e432eb2d84c5c3b13c0f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-08-07 13:50:58 +02:00
Oswald Buddenhagen
bdd8cf300b introduce ProKey class 
while this is actually just an alias for ProString (with explicit
zero-cost conversions only), it nicely illustrates the use of particular
variables. it also serves to hide the NoHash hack from public view.

Change-Id: Iaf9283c64f320ad84a77d9573d1fde6d401c49df
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-08-06 15:05:17 +02:00
Oswald Buddenhagen
7c10134437 add support for option(host_build) 
Change-Id: I7b16d13b0f94d0a2e4b4743a40dad9bd8b8b9698
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-08-01 16:38:09 +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
Oswald Buddenhagen
8d7546d006 allow setting QMAKEPATH and QMAKEFEATURES in .qmake.cache 
follow suit with qmake ...

Change-Id: Idc957b607bbc87f92c8729946b208f9c24a23b4b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-09 21:18:12 +02:00
Oswald Buddenhagen
da26368d9e make qmake property map ProString-based 
Change-Id: I3c25642b885171a47e8fd27e39e5d470d9f24db3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-09 21:14:40 +02:00
Oswald Buddenhagen
5a6625245b introduce ProValueMap typedef for brevity's sake 
Change-Id: I41b7202acb2889d217d1f437050443bea853ee87
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:48:00 +02:00
Oswald Buddenhagen
ed633945ba FunctionDef(s) => ProFunctionDef(s), plus move to proitems.h 
Change-Id: I7bdde81c1913237f11dbfbe7491e0fe750181cd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:05:15 +02:00
Oswald Buddenhagen
ff961351eb proparser => qmake 
namely:
- proparser_global.h => qmake_global.h,
- PROPARSER_EXPORT => QMAKE_EXPORT
- PROPARSER_AS_LIBRARY => QMAKE_AS_LIBRARY
- PROPARSER_LIBRARY => QMAKE_LIBRARY

Change-Id: I6db1e6339b4dced59819f047874d84dff826f398
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 12:04:04 +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
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
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport 
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:35:11 +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
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
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
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
Oswald Buddenhagen
a49d1bffcb add ProFile::tokPtr(): centralize nasty cast 2010-06-24 15:44:37 +02:00
Oswald Buddenhagen
fa79b97511 don't strip path from $$_FILE_ for even for included files 
catch up with the recent change in qmake
 2010-06-24 15:44:37 +02:00
Oswald Buddenhagen
619d830d6a f******ck .... revert "deeeeebug" 
This reverts commit 47885c114b.
 2010-06-14 14:43:00 +02:00
Oswald Buddenhagen
47885c114b deeeeebug 2010-06-14 12:45:10 +02:00
Oswald Buddenhagen
a1fa00d2e7 precompile expressions 
this gives a rather significant boost, in particular for
expressions which are evaluated repeatedly (includes).
 2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
a8d53e0ae3 serialize AST into a single string 
this saves quite some mallocs in the parsing pass.
 2010-06-02 11:05:27 +02:00