Commit Graph

166 Commits

Author SHA1 Message Date
Tobias Hunger
672fc59fd6 OutputParser: Parsers with fatal errors will now cause failure for all steps
Remove handling of parsers reporting fatal errors from the qmake based
makestep and add it to abstractprocessstep instead. This makes the
osparser work with all build systems.

Change-Id: I1044d0e6002d2157946e0342fe060991ffe37ffa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-23 10:27:11 +02:00
Tobias Hunger
71709f316c Qt4PM: Reduce priority of qmake parser in makestep parser chain
This stops it from eating lines that are actually produced by
the compiler.

Change-Id: I725690eaee6fe223c7024299420a924b455d2723
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-03 16:46:07 +02:00
Tobias Hunger
633c11d184 Handle Qmake errors when running make in a qmake project
Qmake may be run by make, so make the makestep use the qmake parser
in addition to the rest in qmake based projects.

Change-Id: Ibdd3eb476d890d580a8417d691166c4dd33350cb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:46:59 +02:00
Friedemann Kleint
c0b6d1d3f2 Clean headers in Qt4ProjectManager.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 13:38:30 +01:00
Friedemann Kleint
2c9d93a328 Qt4ProjectManager: Forward-declare some classes.
Change-Id: Ia05cbfec090bf42d8b9c0475e8904dbad12486d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 12:41:44 +01:00
Daniel Teske
e0b2d9e233 Qt4Project: Fix building of subprojects for debug_and_release
Use the right makefile.

Task-number: QTCREATORBUG-8793

Change-Id: Ibd836602b465342ccc489e48dc253160e2678b1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-12 13:50:05 +01:00
Daniel Teske
0c92ec0eb2 Qt4ProjectManager Makestep: Add "-r" to disable built-in rules
They slow down make by quite a lot. If there's nothing to do it's a 2-3
times speedup to skip those rules. This patch does that unconditionally,
similar to the -w parameter.

Task-number: QTCREATORBUG-8693
Change-Id: I951308195af3666744ad5e0ca865f42bbf6b5f79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 12:37:12 +01:00
Tobias Hunger
962ba86d0f AbstractProcessStep: Do not run a qprocess in a thread
This avoids sending signals for new tasks and process output
via the gui thread's event loop. When finding lots of issues in
the output we generate so many events that any attempt to
compress events takes a long time (max. events waiting to be
processed were > 1200000 when doing a clang -Weverything build!),
and thus the UI freezes.

Change-Id: I9668d2537b1a268e788cd0ea5c756ebaab4462a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-12 18:31:28 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Daniel Teske
2f862681d7 ProcessParameter: Ensure macro expansion is done in the main thread
The macro expanders are not thread safe. Also the values should be
expanded in init() as later changes to e.g. the buildconfiguration
should not affect the build anymore.

Change-Id: I82f5cd229d82cdb9f897c1db69c47b028cca29d1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-12-07 13:43:09 +01:00
Daniel Teske
cf7f778c2b Remove ToolChain::defaultMakeTarget
That was a Symbian specific hack.

Change-Id: I6c9ed3d4c856699ce0930aa507b3aba43ca94785
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-27 13:52:00 +01:00
Caroline Chao
a3fc029a67 Update Qt4 references to Qt.
Task-number: QTCREATORBUG-8186

Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
(cherry picked from commit 19aa02c94e)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2012-11-08 12:25:13 +01:00
Caroline Chao
19aa02c94e Update Qt4 references to Qt.
Task-number: QTCREATORBUG-8186

Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
2012-11-06 15:23:43 +01:00
Daniel Teske
31e2ddd085 Kit: Add createOutputParser method
Which asks each KitInformation for their parser, thus currently creating
a toolchain + qt chain if that is applicable. Remove all code that does
that by hand from various buildsteps/buildconfigurations.

Change-Id: I79a07ffd1dbe9a43bdbc838bc0098071aa412009
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-02 14:49:34 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Daniel Teske
458cfb18de Qt4 MakeStep Config Widget: Fix signal connection
Change-Id: I16d9cd129701e605256da93b5ecb3c03b65b2e45
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-19 16:29:47 +02:00
Daniel Teske
d3c0557444 Make Toolchain::makeCommand return a full path to the make command
Requires passing in the environment to use. Also now the mingw toolchain
has a fall back to make.exe on windows. And the msvc toolchain falls
back to nmake even if the "use Jom" option is used.

Task-number: QTCREATORBUG-7831

Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-09-12 16:29:30 +02:00
Tobias Hunger
9d90f8b396 Warn if kit has no tool chain set up
Change-Id: I551402c1e3023feeeb127f001a0e908938a07fc2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 16:52:21 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
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