Commit Graph

475 Commits

Author SHA1 Message Date
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils.
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-09 12:33:10 +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
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
Yuchen Deng
d76c09bd12 CMakeWizard: Use better build directories
The "ProjectName-build" is more common, and certainly does not cause
conflict.
Not all of the directories have to be called "qtcreator-build"

Change-Id: Iee671f6091756c09be4ab1192faf244f74cac034
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 13:24:43 +01:00
hjk
b0b105d575 ProjectExplorer: make currentProject static
This saves one function call compared to the instance()->currentProject()
pattern and is typically less to type on the caller site.

Change-Id: I65568f30205fc90e2aaca7e8e7f0192241df8c85
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 19:20:13 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Daniel Teske
f05c27537e CMake Settings: Make cmake executable field grow.
Task-number: QTCREATORBUG-6791

Change-Id: I1e3df08a2217c105b3c905e3ea4cd9b960353396
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-13 15:25:06 +01:00
Daniel Teske
f5d4287123 Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-07 15:05:31 +01:00
tomdeblauwe
a3e101639d fix whitespace in cmakeproject
Change-Id: I62e1f14793fbf994273a838f19b8a4846dcec466
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-05 10:59:40 +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
Nicolas Arnaud-Cormos
84aa93c2bb Fix copyright header.
Change-Id: I9d0791ed519949be820e737d43669ca899a5cef6
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-25 08:50:17 +01:00
Daniel Teske
ed8441a2e4 Fix size of cmake project wizard
Task-Nr: QTCREATORBUG-6581

Change-Id: I391df32dc49a7ee7a34ba4b47bf02d1c1690647a
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-11-22 17:16:59 +01:00
Daniel Teske
97dc1d4ab4 More robustness in reading .cbp files
Instead of choosing the first one, choose the most recently modified one.
Also smallish fix to the title if no .cbp file exists

Task-Number: QTCREATORBUG-6553
Task-Number: QTCREATORBUG-6532
Change-Id: I34e2d7ca6d8242356e92099ed29ca0f0a4a11574
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-16 17:47:47 +01:00
Eike Ziller
d1d85ba912 more s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-11 10:53:34 +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
82f5573626 more Id type fixes
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:57:09 +01:00
Daniel Teske
13c3736832 CMake Wizard: Do not show non existent build directories in red
We do create them, when necessary.

Change-Id: I2eb8e2f9c37db2e73058a5f1b5ff060d651a4995
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-04 14:02:14 +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
hjk
29279ab8c7 more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 18:20:19 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
2011-11-01 18:16:38 +01:00
Eike Ziller
3cb6c23334 Fix showing of "Debugging Helper Missing" warning.
It was only showing up if one had a helper library that was outdated.

Change-Id: I8d0ffcd16434dc6cfeadd408a2bdb59aa3ec73ba
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-31 16:03:15 +01:00
Nicolas Arnaud-Cormos
ba15f8ec2c Add an enabled property in locator, and used it instead of hidden.
Disabled locator won't be displayed in the filter list, but will be
visible in the option page.

Change-Id: I4d39bb8ed04ce49fc34aa84c229b51f26fc70733
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-31 11:53:40 +01:00
Nicolas Arnaud-Cormos
aef4a8fbaf Add a locator to compile a specific cmake target
The locator will show all the targets for the cmake projects, even the /fast one.
It allows people to build a specific target without reloading the whole project.
It's using the make prefix.

Change-Id: Ia6701bb19c1ae390af647d94d0a2834b05a1772a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-27 12:16:47 +02:00
Daniel Teske
42b56788ea Fix a crash with cmake and no toolchains configured
Task-number: QTCREATORBUG-6252
Change-Id: I8b7237c23cd70fe8dd20724ffb3ebdef18f5bf13
Reviewed-on: http://codereview.qt-project.org/6320
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-10-10 13:35:22 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 13:06:52 +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
hjk
66ab323eb3 use Core::Id for IEditorFactory::id
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:53 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
Daniel Teske
4e41308a0f Better error feedback on Open project
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-05 15:10:01 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3'
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
2011-08-30 15:59:07 +02:00
Daniel Teske
eaadc7d3f1 Make CMake Open Project Wizard bigger
Task-number: QTCREATORBUG-5788
Change-Id: I45f54faff6efa7d7a877efc877191dd8ce85c3f9
Reviewed-on: http://codereview.qt.nokia.com/3810
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-08-29 15:59:28 +02:00
Daniel Teske
102860f2b5 Fix crash with no generator selected
Change-Id: If1e09d4f6fda3b266de17087aa9b1aa0014ecaf7
Task-Nr: QTCREATORBUG-5883
Reviewed-on: http://codereview.qt.nokia.com/3410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-08-24 11:18:28 +02:00
Tobias Hunger
3f957f22e7 CMake: Always offer all tool chains
Task-number: QTCREATORBUG-5871
Change-Id: Id9de63f90060ba606ce1a37e618f3ffba6f1e2be
Reviewed-on: http://codereview.qt.nokia.com/3311
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-08-22 15:30:04 +02:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
Daniel Teske
f7bd1277f4 Only show the infobar once
Change-Id: I274627999649d00efead89222bbdc325e55932b7
Reviewed-on: http://codereview.qt.nokia.com/2281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-07-28 13:48:51 +02:00
con
b04c486802 Fixes to CMake wizard layout.
Text on the first page had big left margin.
The cmake arguments + generator + run button on one line were too wide
(on Mac resulting in a non-usable arguments line edit).

Change-Id: Idde43e1acd8f9822c1bfc3d3f3149f254a8a2843
Reviewed-on: http://codereview.qt.nokia.com/1275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-07 15:24:48 +02:00
dt
118de5c2d9 Add a toolchain combo box to the cmake run page
Selecting the toolchain is a configure time setting for cmake. So
that's the right place, except for us the debugger also depends
on the toolchain. Switching the debugger thus involves reconfiguring.

Also due to the cmake cache in most cases reconfiguring with a different
toolchain selected won't do anything.

Cmake and creator's concept of toolchains clash.

Task-Nr: QTCREATORBUG-4898

Change-Id: Ibf84029d7008046891750a91666d0e3e4711ec69
Reviewed-on: http://codereview.qt.nokia.com/477
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-14 15:05:06 +02:00
Leandro Melo
a3daedc7b7 CMake editor: Use keywords scheme for functions
The Link color from inkpot still needs to be changed.
This will be done in a following commit.

Task-number: QTCREATORBUG-5037
Change-Id: Ia8a5203067761ff6622258fd16f2027667637583
Reviewed-on: http://codereview.qt.nokia.com/273
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2011-05-31 15:59:59 +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_
fec98bdf80 Add RunConfiguration::disabledReason
Not used yet

Change-Id: I76b3b81282dea4bca97eaf64e297154a20cf2096
Reviewed-on: http://codereview.qt.nokia.com/190
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-05-27 15:49:04 +02:00
dt_
fc90ea3c10 Remove BuildConfiguration parameter from RunConfiguration::isEnabled
Noone used it anyway, makes the code easier to refactor later.

Change-Id: I367c3f15ec5034740760dfe1becd3063b2e19dc1
Reviewed-on: http://codereview.qt.nokia.com/187
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-05-27 15:15:43 +02:00
Oswald Buddenhagen
7c2afcf179 fix "Debugger:" label alignment
on the way also greatly simplify the code in most copies. it was
probably trying to do what i did, but failed miserably.
2011-05-17 14:45:44 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors
Task-number: QTCREATORBUG-2847
2011-05-12 20:10:03 +02:00
Oswald Buddenhagen
882e34ee28 rewrite editor info bar handling
the info about the bars is now stored in the IFile, not in the
EditorView. this is somewhat more expensive for the bars which
identically apply to all editors of one type, but fixes consistency
issues between views.

additionally, it is now possible to set several simultaneous
info bars per file, which ensures that no information is lost.

Co-authored-by: mae
2011-05-12 20:10:02 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
dt_
5b521e2dad Add "Run in terminal" option also to cmake runconfigurations
Task-Nr: QTCREATORBUG-4695
2011-04-27 16:33:21 +02:00
dt_
2224eb70bb Run cmake dialog: More intelligent hardcoded font
Platform specific now.
2011-04-27 15:58:54 +02:00