| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
|
|
|
|
|
|
|
| |
Also emit the preamble messages earlier
Change-Id: Iba0308255ba77584e85f52ebc6f422187383ddec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I00bb591c027a22088d5f1feedc84aa28523dcca2
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
| |
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
| |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib633c172f3e5a79818ac737016948cbeda82ac41
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
|
|
| |
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-Nr: QTCREATORBUG-6063
Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-6713
Change-Id: Ief7f8509572cfa2008209083e5ae9c7763eba42a
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I706cf262e655c75f60008f78e660843d57bee345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Task-Number: QTCREATORBUG-6365
Change-Id: I19a200e3c811eef83d591f6eacca3e48eb0fba8f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
If we have always deploy project before running option, we need make sure
there not have any build error occured.
If there still exist some build error, we should make a choice for user,
To continue or abort by showing QMessage::question.
Change-Id: I99844494076ce471fb66c059146f5a196bff1451
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I11501635bc5c17db557ea8379eb63c9d3915a05e
Reviewed-on: http://codereview.qt.nokia.com/1316
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
| |
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|/
|
|
| |
Reviewed-by: dt
|
| |
|
|
|
|
| |
Reviewed-by: hjk
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Add a DeployConfiguration class to hold settings related
to deployment.
* Add BuildStepsList to hold a list of buildsteps
* Update BuildConfiguration to use BuildStepLists instead of
manageing lists of buildsteps itself.
* Update BuildManager to use BuildStepLists in its interfaces
* Fix fallout introduced by API changes
* Update .user file to new way of storing settings
Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/compileoutputwindow.cpp
src/plugins/projectexplorer/compileoutputwindow.h
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/projectexplorer/outputwindow.h
|
| |
| |
| |
| | |
Enabling other plugins to know which tasks currently exist.
|
| |
| |
| |
| |
| | |
This changes the colors to be a mix of red/blue and the foreground
color. If the regular text color is either of those, well...
|
| |
| |
| |
| |
| | |
* Have the BuildManager report whether it queued the buildsteps
or not.
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
Is more then twice as fast
|
|
|
|
| |
Task-Nr: QTCREATORBUG-1044
|
|
|
|
| |
Task-Nr: QTCREATOR-7
|
|
|
|
| |
Since otherwise we can't forward declare it.
|
| |
|
| |
|
|
|
|
|
| |
* Update the import label (and related stuff) whenever the
project was rebuild.
|
|
|
|
|
|
|
|
| |
Actually that's more correct. E.g. imagine building a project, and while
the qmake step runs changing the working directory. The make step would
be affected by that. With the change both the qmake and make step get
their working directory on beeing added to the queue and so don't care
if the setting is changed afterwards.
|
|
|
|
| |
The pointers can be used to distinguish BuildConfigurations
|
|
|
|
|
|
| |
Move the API to the progress manager.
Added a first Mac implementation, other
platforms are pending.
|
|
|
|
|
|
| |
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
|
|
|
|
|
|
|
|
|
|
| |
* Use Task class in addToTaskWindow(...) signal. This introduces
support for task categories into the BuildParsers.
* Add a task category for buildsystem issues.
* Update existing BuildParsers to new API and assign their
tasks to the Compile or Buildsystem task category.
Reviewed-By: dt
|
|
|
|
|
|
|
|
| |
The category differs between e.g. TODO tasks, compiler errors/warnings,
qml syntax errrors ... Idea is that every plugin can manage it's
own virtual list of tasks.
Reviewed-by: dt
|