feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
25,421 Commits 108 Branches 368 Tags
328d205b624a94cf2f515ae8934b86b934c43f48
Commit Graph

146 Commits

Author SHA1 Message Date
Eike Ziller
5a895d4fe5 Rename "Tool Chains" option page to "Compilers" 
Currently it contains compiler settings only, so there's no
need to let people search for e.g. debugger settings there,
that might be considered part of the toolchain, too.

Change-Id: I458f3d1cf1784b85820f8af7604a2a004372a909
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-24 09:26:51 +02:00
Tobias Hunger
af63967d29 Fix creator not showing warnings when building with missing tool chains 
Change-Id: I1e058a42f2bb0b0df00e403aae5d9cc47e960076
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-10 15:01:25 +02:00
hjk
83e573f2ec use new id comparison operators to reduce line noise and save cycles 
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-06 10:37:43 +02:00
Robert Loehning
bc4578a93c Fixed typo 
Change-Id: Ie9a455b765aa75d28dc7e0298556e91b17619e77
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-30 18:31:11 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6. 
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-27 17:08:12 +02:00
Friedemann Kleint
455b677f8e tr()-fixes for 2.6 
- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-26 16:14:42 +02:00
hjk
42a26ad450 compile fix 
Change-Id: I619b710c403ed365b1e7b63bc8fdf0a2b853d9c8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-26 14:29:16 +02:00
hjk
a4ea39871a projectmanager: style 
Change-Id: Ic00f11b97f3cb4b14397c59ad9a51fb2c7fd2b48
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-26 13:26:39 +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
Tobias Hunger
2431456216 Profile introduction 
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-21 12:08:12 +02:00
Orgad Shaneh
5c23c44ed0 Qt4PM: Support "Build File" for debug_and_release configurations 
Task-number: QTCREATORBUG-106

Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-18 14:14:25 +02:00
Daniel Teske
8264470346 Ups, unbreak overriding make command 
Task-number: QTCREATORBUG-7430
Change-Id: I3e2fa49f749ef33a6abece5d98fd4a1ee6d6e66d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-16 11:53:42 +02:00
Orgad Shaneh
72bf41b40f Qt4PM: Build current file 
Task-number: QTCREATORBUG-106

Change-Id: I3511f57b9128073104f6691a469f9c54d64138c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-07 16:39:18 +02:00
Daniel Teske
1a9b436cc1 Qt4ProjectManager: Cleanup TODOs 
Change-Id: I3c274c5b9aa37e14d74da3276d7012983f14fc89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-03 16:27:55 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-25 11:49:19 +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
Daniel Teske
5d0407ef46 Optionaly disable buildsteps 
Task-number: QTCREATORBUG-6713
Change-Id: Ief7f8509572cfa2008209083e5ae9c7763eba42a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-31 18:04:27 +01:00
Friedemann Kleint
2a2ef450ac tr()-Fixes for 2.5. 
Change-Id: I51d3f71e49b7cbd2e7608a11e08f3066ee133776
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2012-01-31 12:04:52 +01:00
Tobias Hunger
97496df1bf Task: Update Task to use Utils::FileName and Core::Id 
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-30 11:34:43 +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
Daniel Teske
334dc84072 Fix warnings about connects on adding makestep to deploysteps 
By actually fixing the underling problem

Change-Id: I3ee41ba9238f63f8a645c5d29e6627c6d4f4f7f9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-17 12:49:31 +01:00
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII. 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-14 21:13:41 +01:00
Daniel Teske
bcbf17a3b0 Fix crash on adding MakeStep 
This time for real.

Task-number: QTCREATORBUG-6688
Change-Id: I5256e8ca2b50830d8b8b2dd0202031c27bdc6923
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 15:41:05 +01:00
Daniel Teske
fea23ff5a1 Fix crash on adding MakeSteps to a DeployConfiguration 
Task-number: QTCREATORBUG-6688
Change-Id: I6d1e44ee0e1e67a5fc4289f508a7c285e4e6c13a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 13:30:23 +01:00
Daniel Teske
d13fca02a4 Readding MakeSteps to the clean step list should set them up correctly 
That is set the argument to "clean" and ensure that the return value is
ignored.

Change-Id: I1f15ad464e6f4608d7eb698365846a4c765f1d22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
 2011-11-25 11:08:50 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
 2011-11-25 09:48:25 +01:00
Tobias Hunger
0ce9fa2c16 UI files: Do not polute the global Ui namespace 
Make sure all ui-files are in the plugin's internal namespace.

Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-24 10:49:41 +01:00
Tobias Hunger
9f19b848e4 Override LC_ALL for the make step 
Override LC_ALL in the makestep, not LANG in the toolchain's
addToEnvironment.

Task-number: QTCREATORBUG-6488
Change-Id: Ic3de4f53f99b6b9d88a1337c65aa7f4839d4099d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-22 15:00:35 +01:00
Daniel Teske
5f8b341838 Actually pass MAKEFLAGS to nmake/jom 
Change-Id: Ia42fccff507fce1e999d4534656984b6ebf5180b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-16 17:47:54 +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
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Robert Loehning
998281c5c9 "Build Issues" was renamed to "Issues" 
Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-25 11:57:10 +02:00
Daniel Teske
a609689a2e Fix make not found in environment 
Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-20 14:51:02 +02:00
Daniel Teske
85cfc50121 Prepend "L" to MAKEFLAGS for nmake and jom 
Change-Id: I2a36b0a194cda1907b07155449cd610171cc1df9
Task-Nr: QTCREATORBUG-6167
Reviewed-on: http://codereview.qt-project.org/5814
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-06 13:08:58 +02:00
Daniel Teske
b96d7b9bd8 Make Qt4ProejctManager::MakeStep::run multithreading safe 
Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4
Reviewed-on: http://codereview.qt-project.org/5451
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-23 12:30:34 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Friedemann Kleint
d4e1d7c6ad Header cleanup in Qt4ProjectManager. 
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-18 16:50:01 +02:00
Leena Miettinen
f1889864db UI text: check capitalization and tooltips 
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-22 10:05:33 +02:00
dt_
2cc7bea066 Remove BuildStepConfigWidget::init() 
It serves no purpose anymore.

Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-30 14:44:33 +02:00
dt
e3842f9973 Move QtParser to QtSupport plugin 
This way we can make use of it in the cmake plugin

Change-Id: Ie1887d49ea616ec62d91a73b4daa75d69cef61c9
Reviewed-on: http://codereview.qt.nokia.com/91
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:47:02 +02:00
dt
8e171e0be0 Qt Version refactoring 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
 2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Tobias Hunger
1c3360998e Update makestep on toolchain changes 
This way the makestep configuration widget's details will reflect
the actual arguments used.
 2011-04-14 17:25:02 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
3a75137acd Qt4Project: Don't show a error on initial building 2011-03-25 17:22:04 +01:00
dt
9b9f19dd7d Qt4Project: do not show a error on make clean without a Makefile 
Task-Nr:
 2011-03-24 20:44:46 +01:00
dt
2639888a33 QmakeStep: Warn once for missing toolchains 2011-03-24 19:45:19 +01:00
Tobias Hunger
2af168e109 Do not try to build in Qt4 makestep without a tool chain 
Reviewed-by: dt
 2011-03-24 15:44:58 +01:00
Tobias Hunger
7c1e0853a5 Show all parameters of a makestep 
Show everything we pass on to make, incl. the parameters we pick up from
the Toolchain via the QtVersion.

Reviewed-by: dt
 2011-03-14 14:47:59 +01:00