Commit Graph

3443 Commits

Author SHA1 Message Date
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
dt_
29d6f9b788 Always append cmake output 2011-04-27 14:45:30 +02:00
dt_
eaabc9f06f Use fixed font in the cmake output window
Task-Nr: QTCREATORBUG-4658
2011-04-27 14:45:30 +02:00
Oswald Buddenhagen
fae7dc9584 add errorString output argument to IFile::reload() & IEditor::open()
add/unify read error handling in all affected classes
2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
f1f9904d35 add errorString output argument to IFile::save()
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
2011-04-18 14:10:13 +02:00
Friedemann Kleint
d81b039e19 Compile. 2011-04-15 16:10:32 +02:00
Tobias Hunger
3fc8e6fe2a small WS cleanup 2011-04-14 17:25:01 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
70d392d235 core: make context and widget IContext data members 2011-04-14 11:15:07 +02:00
dt
dd59a14936 CMakeProject: Fix wrong slots
We never noticed that we had run cmake

Reviewed-By: hunger
2011-04-13 13:39:06 +02:00
dt
8a276097c6 Fix available toolchains for cmake and generic project manager
Reviewed-By: hunger
2011-04-13 13:38:58 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project
Reviewed-by: dt
2011-04-12 12:46:26 +02:00
con
7bd87aed36 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
2011-04-01 10:33:20 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
2011-04-01 09:53:09 +02:00
dt
fcbb38988b CMakeProjectManager: Change editing cmake files to not pop up a dialog
Stop watching the cmake files for changes, instead watch the cbp file
for changes. Warn the user that changes in the CMakeLists.txt via a
infobar.

Fixes or obsolets a few bug reports:
Task-Nr: QTCREATORBUG-3123
Task-Nr: QTCREATORBUG-3353
Task-Nr: QTCREATORBUG-2487
2011-03-31 18:26:51 +02:00
Jarek Kobus
798225ce0a Update source strings
Reviewed-by: Pawel Polanski
2011-03-31 09:58:19 +02:00
dt
4f278cbfed Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/disassembleragent.cpp
2011-03-21 17:48:19 +01:00
Tobias Hunger
b2df065b56 Use distinct ABIs for MSVC versions
Use a distinct ABI OS flavor for each of the supported MSVC versions.

Task-number: QTCREATORBUG-4129
2011-03-21 15:46:42 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
con
476223cdd6 Merge remote branch 'origin/2.2' 2011-03-11 09:26:43 +01:00
dt
f4ca6959c4 CMakeProjectManager: waitForFinished()
silences a qt warning.
2011-03-10 15:38:26 +01:00
dt
a64b0e0a20 Trailing whitespace... 2011-03-10 15:38:26 +01:00
dt
ffd6d307a0 CMakeProject: Better order of include directories
Project directories should come before system directories.

Task-Nr: QTCREATORBUG-3959
2011-03-10 13:51:08 +01:00
Christian Kandeler
439b45618e Start making the Maemo support more generic.
This includes:
    - decoupling deploy configurations from targets (Reviewed-by: dt)
    - adding a "Generic Linux" device type
    - splitting up the Maemo deployment step into small pieces that
      can be combined in different ways (and much more easily maintained)
    - adding a new version handler for pro.user files
      (Reviewed-by: Tobias Hunger)

Also:
  - Add and use an SSH manager class for easier connection sharing.
  - Make the SSH connection parameters a fixed attribute of the connection.
2011-03-09 13:10:19 +01:00
Oswald Buddenhagen
64cfa4615d don't validate executable paths & working dirs in build & run configs
it's well within expectations that they do not exist at the time of
configuration (especially when shadow building).
additionally, keeping the validation info (macros and environment)
up-to-date would require a notification infrastructure which is just not
worth the effort.
2011-03-08 20:46:11 +01:00
Milian Wolff
d6ea2945f0 add API to query build type (unknown, release, debug) to BuildConfiguration
Merge-request: 261
Reviewed-by: dt <qtc-committer@nokia.com>
2011-03-03 16:12:00 +01:00
dt
665567fca3 CMake Project: Adjust to toolchain changes
Fixes a crasd, removes member variable for toolchain
2011-03-01 21:06:37 +01:00
Friedemann Kleint
562265d58c Toolchains: Header cleanup. 2011-02-28 16:50:14 +01:00
Kai Koehne
5d615f7fbf QmlDebug: Enable 'What are the prerequisites?' link in run configuration
DebuggerLanguageChooser is in utils, which is why we cannot directly open
the URL in the help plugin.
2011-02-25 09:24:39 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style
Reviewed-By: Tobias Hunger
2011-02-23 17:56:33 +01:00
dt
abedeeb90d CMakeProjec: Add "Run cmake" to Build menu and context menus 2011-02-23 15:52:56 +01:00
hjk
b38ce276d4 use IEditor::widget() instead of BaseTextEditor::editorWidget() when possible 2011-02-22 16:55:55 +01:00