feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,610 Commits 108 Branches 368 Tags
e7e74db758ee3964ad8898eb398652f5db00a181
Commit Graph

71 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +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
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
Jarek Kobus
798225ce0a Update source strings 
Reviewed-by: Pawel Polanski
 2011-03-31 09:58:19 +02: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
hjk
a8ae618d75 toolchain: fix enum naming style 
Reviewed-By: Tobias Hunger
 2011-02-23 17:56:33 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support 
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
 2011-02-21 18:33:23 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +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
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
dt
30044e842f CMake Run Page: Colorize output and disable finish on cmake error 
Task-Nr: QTCREATORBUG-2592
 2010-10-04 17:53:15 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
dt
aa8e2e8e0f Allow relative paths in Build directories, Working Directories 
Relative to the project's directory.
 2010-09-17 15:32:41 +02:00
Leena Miettinen
0037296d70 Doc - Fix UI text capitalization to follow the KDE style guide. 
Reviewed-by: dt
 2010-09-15 10:30:51 +02:00
dt
5fae9b94c0 Cmake: Add a "Reconfigure project" to the Project Page 2010-09-02 13:57:35 +02:00
dt
a12daa6262 Change the build directory for cmake 
It is now in the parent directory of the src directory.
Task-Nr:   QTCREATORBUG-1109
 2010-04-12 17:39:59 +02:00
Jarek Kobus
20c0817a3f Replace QWizard with Utils::Wizard 2010-03-31 15:22:14 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
dt
24a4590767 Cmake: Let the generator determine the toolchain 
Otherwise we need to parse the cbp file, which happens only if the
buildconfiguration gets active. Also try to decouple a few internals a
little bit by using signals. The CMakeProject still handles a few things
directly instead of via signals, more to come eventually.
 2009-12-07 15:00:17 +01:00
dt
c8e7df16eb Show a cancel button in the opening cmake projects wizard. 
Allows the user to change his mind. :)
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
 2009-11-03 14:37:34 +01:00
dt
1253c55d56 Fix a race in CMakeProjectManager::createXml 2009-10-21 13:45:49 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
dt
6639389c74 Use !atEnd() instead of canReadLine(). The later is rather broken. 2009-09-23 15:40:19 +02:00
dt
0f35338714 Fix a one off error in figuring out the cached generator. 
Though there's still a bug in that canReadLine() returns false.
 2009-09-23 14:34:53 +02:00
dt
261796c3c6 If no cmake executable is specified or a invalid path, ask the user. 
Directly in the wizard and save that to the settings. Also give feedback
if a wrong path was entered.
 2009-09-23 14:33:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
66663090e4 Add the directory we are refering too in the cmake wizards can't build 
out of source page.
 2009-08-13 18:05:12 +02:00
Friedemann Kleint
cbfa2c0191 Fixed translation glitches. 2009-07-31 16:41:12 +02:00
dt
935a54c167 Always show the wizard even if we already have a recent enough cbp file. 
That case is a corner case, it can happen if the user has run the codeblocks generator on the command line or if the user deleted the .user file. We mostly ask to get the user a chance to check that we set the correct generator. Or let him select the correct one if there are multiple msvc versions.
 2009-07-03 12:46:19 +02:00