Commit Graph

22625 Commits

Author SHA1 Message Date
Tobias Hunger
7ad7886b07 TC: Use FileName for debuggerCommand()
Change-Id: Ifa168b95d290bfae5c342981c4e4556d6f6913eb
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:34:46 +01:00
hjk
fa26b986de debugger: fix recent regression of non-persistent expanded watch items
Change-Id: Iec8b37812faca5584d268712181ffeca98ef6e8a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:20:28 +01:00
Kai Koehne
c06727ca17 Debugger: Fix runtime warning if QmlJsInspector plugin is not loaded
Change-Id: I9c8132b4af2d1664622e4574e0c442a96b88c778
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:03:24 +01:00
Kai Koehne
2ec1f1d970 DebuggerEngine: Avoid warning when aborting in EngineShutdownRequested state
Change-Id: Ib0e0a2bbf0fa7d109a3910d0814ec9edef130dc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:03:02 +01:00
Kai Koehne
6bb77534c0 QmlCppEngine: Fix warnings about invalid state changes
Change-Id: Iaa45ff106f5f71a2c7f4729c64c281921b855f80
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:02:34 +01:00
Kai Koehne
75a9d6961c DebuggerEngine: Avoid warning when aborting in EngineSetupRequested state
This can happen e.g. inside the QmlEngine as part of a QmlCppEngine.

Change-Id: Id649086b3febe91e73d4784f3abb7f6d7a0d0d50
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 14:59:30 +01:00
Erik Verbruggen
ea27d72d19 Fix crash when doing "Move into file" refacoring action.
Change-Id: I0b42953b7bce6b594387777691aca4c2683a5828
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-19 13:59:46 +01:00
Daniel Teske
6efd36a790 Add missing update Actions
Change-Id: I23765629a2c95c65f3ff3dc5c948d3386aeb962e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-19 12:40:51 +01:00
Leena Miettinen
a0adceb809 Doc: link to KDE-Files.org
Task-number: QTCREATORBUG-6793

Change-Id: I783bd97445620f3795c8b7378aee8ca4557e0dda
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-19 10:37:12 +01:00
Leena Miettinen
d465f2e363 Doc: use macro for Qt Simulator product name
Change-Id: I68b7d4d2d8a6ef62f3b09aaf114b1cde94cda63b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-19 09:39:41 +01:00
Aurindam Jana
79f7e6edfa ScriptConsole: Keep History
Keep History when view port is cleared.

Change-Id: I6b2d3bdb2b7bbb78cbcb891820a355ba6b074e6f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 15:53:57 +01:00
Daniel Molkentin
ab079b86cf Add platform names and versions
Also introduce $INSTALL_EDITION env var which acts as infix.
(possible values: opensource, commercial, etc)

Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-18 15:53:50 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
hjk
31d5ec9cab debugger: enable forceful abort of mixed qml/cpp engine
Change-Id: I815f0bf91e8ca58c9e472f81a234834dc341f29d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 15:00:00 +01:00
Aurindam Jana
70bcccd646 ScriptConsole: Show current context
Show the current context in the script console. The expression
in the script console is evaluated within this context.

Change-Id: Ieb4cfc3e0892b150301f4ad79220cd878dee3ce3
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 14:57:41 +01:00
Aurindam Jana
8e7a11392c ScriptConsole: Output of expression
Show the output of console.log correctly when
evaluated in the script console.

Change-Id: I7ca3393f0db21cb02b8546c17c4c8756d907b8ec
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 14:53:03 +01:00
Leena Miettinen
ab46da7302 Doc: add numbers for creating screenshots
The numbers can be used to highlight parts of screenshots.

Change-Id: I99ba5b16ee284c6647aab214edec18c3d665bf87
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-01-18 14:41:27 +01:00
Leena Miettinen
61e1700f93 Doc: use variable for product name
Change-Id: I17a720f2bd9732f607d104ae6645e6f8eb64fb61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-18 14:38:28 +01:00
Leena Miettinen
c68b83cb47 Doc: fix field name in doc
Change-Id: I281a8a8b3dbe375dfb0905e4d033a52b0e2ef473
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-18 14:37:32 +01:00
David Schulz
354b51fda0 Set focus to the editor after selection change in outline
now also if the selection is changed in qmljsoutline

Task-number: QTCREATORBUG-6306
Change-Id: I07365de90cc932bcc5d0ccf021b3dd7daf3bc17a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-18 14:30:42 +01:00
Eike Ziller
e583422cbf Still start up in welcome tab initially and if it was the previous tab
Amendment to fe068869b9

Task-Number: QTCREATORBUG-6803
Change-Id: Ibf93ff87fc535133b87d8fdc51c2bce4da77ab76
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 12:12:38 +01:00
Eike Ziller
841d5a9939 Fix FileName::appendPath (and through that Qt abi detection on Mac)
appendPath was actually not ensuring a '/' between the parts, contrary
to what it claimed.

Change-Id: I80b703160fc05c099db9b461366c91a55525038b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-18 11:02:45 +01:00
Eike Ziller
075c598f92 Mac: Explicitly set architecture to selected tool chain.
The tool chain selection in build configurations had no effect on the
actual build, which is especially visible on Mac with universally built
Qt. The patch passes the tool chain's architecture (+bit width)
explicitly to Qmake. Users can override this behavior as usual by adding
or removing architecture flags from CONFIG in the additional arguments
field.

Task-number: QTCREATORBUG-6088
Change-Id: I92fdb7d5650db6e681945fa82e86422917f84035
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-18 09:45:31 +01:00
David Schulz
c80ec5513c fix for locator using up and down keys under mac
Fixes the issue that you cannot switch elements by the up- and downkey in the locator under mac.

Task-number: QTCREATORBUG-6826
Change-Id: I452bb487608fad3b32c845036939f02e9cf4b3b6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-18 09:39:16 +01:00
Daniel Teske
2ac162dd2f Coding style: wrongly indented line
Change-Id: Id8293537f7e608065862483fdbf7f425c09f5fe6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 19:47:16 +01:00
Daniel Teske
22c43a59ef Remove dead code
Change-Id: I31159768dc7ff1b4634f210833874b8f141ee4cd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 19:47:01 +01:00
hjk
334b7cb426 debugger: don't allow L&E expansion while inferior runs
Change-Id: I1179f2b3b0f1e0099e5ab2a30b09e1216cd68fd7
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:40 +01:00
hjk
183769e7ef debugger: grey out Locals&Expressions when not accessible
Change-Id: I61489b9a5bf117be154ed6899beb3f8294247c9e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:30 +01:00
hjk
ad5c0edd33 debugger: handle RunToLine and JumpToLine in assembler
... even when not using the context menu.

Task-number: QTCREATORBUG-6811
Change-Id: I1dae875a4c573eba345c6a87cdb0ea24dc50c235
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 17:01:02 +01:00
Robert Loehning
36573eda7b Squish: Running tst_build_new_project on more build configs
Change-Id: I413f5393bb8d56842d8132e26123ebe21d89c57a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-17 16:24:23 +01:00
Robert Loehning
c51a128efb Squish: Fixed typo
Change-Id: I4b694b0ba007ba7f7d6af37857fca57ceecdc4f0
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-17 15:45:05 +01:00
Robert Loehning
73005e6bca Squish: Added functions for switching build configurations
Change-Id: I03eb8987ec28bac7db99395ed91952d8a3a0d038
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-17 15:44:47 +01:00
Tobias Hunger
82709dc766 Git: Fix finding of top-level directory
Fix finding of top-level directory for git when
  * Git version >= 1.7.0 and
  * the directory queried does not exist

Task-number: QTCREATORBUG-6821
Change-Id: I54a6050b71fe924f421921b8e5b468578db1210d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-17 14:59:11 +01:00
hjk
dc73498d34 debugger: show value of pointers that can't be dereferenced
Task-number: QTCREATORBUG-6814
Change-Id: If7aa58e007ba17cb7dfb3b5f3ab8950a60bbf064
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 13:35:42 +01:00
Daniel Teske
ceba70664f Compile
Change-Id: Ie3c8d7f3cc56aa8beac29ff212e41de64e755abb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-17 13:20:16 +01:00
Thomas Hartmann
91e23a4bda Welcomepage: remove rss feed
MultiFeedRssModel gets removed since it is not used anymore.

Change-Id: I955e18cc3abb55468b1afdaf9785f74f4b522357
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-17 13:04:19 +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
Daniel Teske
0a5d41cbea Move findInstalledJom to a more suitable place
Jom does not replace mingw32-make but nmake

Change-Id: Id9849cfb7313f08f7dc1ca9b67997b6589e7942b
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-17 12:49:14 +01:00
Thomas Hartmann
18dfe87ec9 Welcomepage: crashfix see QTBUG-23445
In combination with commit
fe068869b9
this seems to fix the issue.

Task-Number: QTCREATORBUG-6803

Change-Id: I845e18ff3abb55468b1afdae9785f74a4b522356
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-17 12:44:27 +01:00
Denis Mingulov
eed531ff9e Valgrind plugin: fix for just partial usage of coreplugin/coreconstants.h values
Valgrind plugin CallgrindTool and MemcheckTool modules sometime use
coreplugin/coreconstants.h values for icons (e.g. Core::Constants::ICON_REDO),
and sometime - an own constant is used like ":core/images/prev.png".

This commit is fixing this issue and changing everything to Core::Constants
usage.

Change-Id: I8d6f473a66a3181b03e2193314d17661df1d4cc1
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 12:25:10 +01:00
Tobias Hunger
f77dfaddd1 Add API for FileName to PathChooser
Add a API to enable use of Utils::FileName in the PathChooser.

Change-Id: I787ef0e23001188fda10497c8ee22a5c2352de4d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 12:01:37 +01:00
Tobias Hunger
664fb6339b Use Utils::FileName in abi
Use FileName when passing in a file to extract ABIs from. Also convert
some helper functions in baseqtversion to use FileNames in favor of
normal strings.

Change-Id: I41c724c4c05bb4ff0d8b832f84fffa08d64762d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 12:01:14 +01:00
Kai Koehne
daac078756 QmlCppEngine: Properly handle requestRemoteSetupCalls
Remember which engines called requestRemoteSetup.

Change-Id: I75d11a21f0ebcbce1bba0aa4f653d1cc35b43483
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-17 11:36:19 +01:00
Kai Koehne
73464a1d9b QmlJSDebug: Support version 2 fo QDebugMessageService
Change-Id: Icc7af5ace287370a5f295e5c2d5dbee0e2c97610
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-01-17 11:36:05 +01:00
Alessandro Portale
fe068869b9 Workaround QtDeclarative crash QTBUG-23445
Just hardcode the initial WelcomeTab to 1

Task-Number: QTCREATORBUG-6803

Change-Id: I735d18dd3abb55468b1afdae9785f74a4b522345
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-01-17 11:18:35 +01:00
Kai Koehne
fc2d8deae3 QmlEngine: Move setup logic from setupInferior to setupEngine
This is more in line with e.g. the gdb engine, which also emits
requestRemoteSetup in setupEngine().

Change-Id: I1c2a4c56d6f190a3043ea8a18d2bb28c9d340826
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-01-17 10:53:16 +01:00
Kai Koehne
007cb7eccb DebuggingHelper: Build with right architecture even for Mac universal
Task-number: QTCREATORBUG-6737

Change-Id: Ic4f814aa031902570310aad156e4b2ca9b2d3c26
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-17 10:52:32 +01:00
Kai Koehne
2cf6cd6cba QmlProject: Print a warning if the mainFile given is not readable
Change-Id: If5951bb3121b13287a3ccf9d684bf23e0673231c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-17 10:52:07 +01:00
Leandro Melo
1dc7e0d3ed C++: Don't show inspected type in type hierarcy bases/derived
Instead, show it on a label above.

Task-number: QTCREATORBUG-6775
Change-Id: I7bf8e72c8a0ba1c07444230915d72b0cd9b66672
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-17 10:22:51 +01:00
Daniel Molkentin
ccb0a1bf9e Add make dmg target
Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-17 09:53:10 +01:00