Commit Graph

22748 Commits

Author SHA1 Message Date
David Schulz
094bc85dd0 Fixes for some tests in the simple test for the debugger.
Change-Id: Ieebc1cf6673e2b2b7bffbacb2f0e4dce610b26c9
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-01 16:20:00 +01:00
Tobias Hunger
59e2844b2a Gcc: Fix wrong path
Task-number: QTCREATORBUG-6890
Change-Id: I8c8a39e5bb61b11f03eb970fbeb9538a47cd8c0f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-01 16:15:02 +01:00
Tobias Hunger
5bb2fecb7c Gcc: more consistent naming of variables
Change-Id: I684f4bb4837e0f5c142128c37196fa9ef3b5af22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-01 14:43:54 +01:00
hjk
658a608083 core: prevent allocations when looking up an existing Core::Id
Change-Id: I7bd2f83ffc6a57135aab9f76ff929eca48d16885
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-01 14:08:10 +01:00
Kai Koehne
fe8cead2d0 Debugger: Make language to debug (QML/CPP) explicit
Make the choice of language part of the DebuggerStartParameters,
instead of deriving it indirectly from the current project. This
prevents e.g. the QmlCppEngine to be used when loading core files.

Change-Id: I9d1c9ab318ba789abe3a6ea0478ebda71857e793
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-01 12:14:02 +01:00
David Schulz
e46a5579d3 Editor: Highlight background for whitespaces in strings and comments
The whitespaces are now highlighted with the same backgroundcolor as the characters.
Also added a test for the Lexer.

Task-number: QTCREATORBUG-5802

Change-Id: Ic1bcd8cfe30d6b8a0281b7963eaab310f972b9d2
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-02-01 11:17:56 +01:00
Orgad Shaneh
8c2bcd14da Debugger: Reload locals on dynamic type toggle
Change-Id: I2ff075bcc5607fec9bd9dc8596108ec5f076d48d
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-01 09:48:05 +01:00
Orgad Shaneh
5e3cebd0f4 Debugger: Remove unneeded setUseDebuggingHelpers slot
Change-Id: I62be12e5afe6d2b9a81c03e980e01a49dc4e4632
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-01 09:47:47 +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
Leandro Melo
5b847a66df C++: Handle add definition on empty files
Now in the case of a matching empty file we still select a best
token so the insertion happens *at* the end of the file.

The patch also fixes line breaks after the definition to be inserted
for situations in which there's no line break yet. Example:

namespace Foo {}

namespace {
}

Another thing for correctness. Member _key from HighestValue is now
value initialized instead of default initialized.

Task-number: QTCREATORBUG-6696
Change-Id: I5c0303675429c3da5cb88825272c9611be022f6a
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-01-31 16:44:38 +01:00
David Schulz
ac3093058c source for win64interrupt
The WinAPI funcion DebugBreakProcess must be called from the same bitness as the target process, so win64interrupt is a small 64bit executable calling this function.

Task-number: QTCREATORBUG-2521
Change-Id: I3259d505b9b228be72ca4eaca42a9cde5b4984ac
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-31 16:38:13 +01:00
Robert Loehning
7dbc6014e3 Squish: Added test for command line output
Change-Id: I4a25f971d41acd5e349e753602d4ae3aaafb4e32
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-31 16:37:31 +01:00
Friedemann Kleint
3fd55ef09b Compile fix.
Change-Id: I6d6007dc9578acae62c1d41a07164a917e879cd5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-31 16:28:30 +01:00
Daniel Teske
c730a7dadf SessionManager: More useless null checks
Change-Id: Ice94b56ffda04babbb66317f77d5b121f72b051f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 16:03:41 +01:00
Daniel Teske
32ccf8ade4 SessionManager: Remove declaration of not implemented function
The function was removed long ago.

Change-Id: Iee1e413bb675e360eb15a89bcb5d37ac83b40e84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 16:03:34 +01:00
Daniel Teske
9ac92e6fad Remove class SessionNodeImpl, just use SessionNode directly
The class added nothing over SessionNode.

Change-Id: I137c274514b2c5897a591b7e093ba84e1a91e9d7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 16:03:25 +01:00
Daniel Teske
53ffa9c676 Remove SessionManager::currentSession
It returns the same as activeSession

Change-Id: I244747eddcca3fda181eb8dc52b1b616beba212e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 15:52:12 +01:00
Tobias Hunger
3c53e53259 ToolChain: Add compilerCommand() method
Add a method returning the compiler command used. With this information
the buildsystem plugins can do better setup of the project.

Note that the compilerCommand refers to a C++ compiler!

Change-Id: Iad0bfa6a532cbdc38228db71599ab6192cb6127c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2012-01-31 15:49:31 +01:00
Daniel Teske
b8ae31e664 Remove checking for a null sessionmanager.
That can't happen.

Change-Id: I05293e96e7a716fbaf5fd03aa182c723c9858a03
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 14:15:35 +01:00
Kai Koehne
2a02841383 Debugger: Simplify handling of requestRemoteSetup in QmlCppEngine
Just emit the requestRemoteSetup on your own in QmlCppEngine. Also
properly check the related state transitions in DebuggerEngine.

Change-Id: I15dc4236303911126de7eee63ed996bdd8e5c5a8
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-31 14:14:05 +01:00
Christian Kandeler
095946d441 Qt support: Don't set LD_LIBRARY_PATH for building
This does not make sense for non-Desktop versions, where it can cause
libraries from a sysroot to be erroneously picked up by executables in
build steps. Only set it for running desktop qt run configurations.

Change-Id: I3b098d5b1179eaefe20824b18a8976d68013d20d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-31 13:57:39 +01:00
Eike Ziller
5a09b26538 Delay decision if Maemo Qt version is valid.
It was done in the constructor, so Qt Creator would call madadmin at
startup. Do that lazily when someone requests that information.

Change-Id: I85592ccd733ebae0f1239579ad07ed8f5fcb3502
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-01-31 12:36:46 +01:00
Daniel Molkentin
25a767c760 Extend the CSS workaround in the helpviewer
The documentation now uses /doc instead of /qdoc.

Change-Id: If01ee02d236cb343f78e0c185a3e05620dac24ae
Reviewed-by: Michael Bruning <michael.bruning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-31 12:12:39 +01:00
Eike Ziller
284f7dfb2f Fix debugging with Mac gdb.
gdb was not answering to "set breakpoint always-inserted on" at all.

Change-Id: I5fead2e735097236ba094d80bfbd4fa43143e5f7
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-31 12:06:03 +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
Daniel Teske
8591b89807 Ensure consistent size of facnyactionbar button
Otherwise the button can jump on switching projects.

Change-Id: I2b6d0a5afe5fc54933fe31d381a312cce896361e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:59:28 +01:00
Orgad Shaneh
d3f889df7d Git: Prepend to PATH instead of replacing it
Change-Id: Ia6d783e97d7f4c80a3838b0167dcdcfce5fe4a6e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:43:38 +01:00
Friedemann Kleint
e2ace515e2 Version control: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:26:52 +01:00
Tobias Hunger
cdae5f2102 Toolchain: Add type() method.
Rename typeName() to typeDisplayName() to make it clear that this is
a user visible string that is translated. Add type() method to provide
a simple string that can be used by build system plugins to find out
which kind of toolchain currently is in use.

Change-Id: I7c3f050aa82c8b17071fd03ee142c5ae2f17b1de
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2012-01-31 11:14:47 +01:00
Tobias Hunger
319928ff5f Maemo: Fix misdetection of maemo tool chains
Task-number: QTCREATORBUG-6876
Change-Id: I6410a9894c2482d2b6ea7f2fba9b67f7fdb4fff6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:13:38 +01:00
Friedemann Kleint
499c831213 qtcreatorcdbext: Fix potential double deletion.
Task-number: QTCREATORBUG-6878

Change-Id: I4eab2406897c45f19a8ba297e3d7adbed8eafdd9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-31 11:02:08 +01:00
Flex Ferrum
c6fc0be8ae C++: Type deduction for auto-declared variables implemented
Handled to major cases of 'auto' variable declaration:
1. auto var = someInitializer;
2. Q_FOREACH(auto item, collection) or foreach(auto item, collection)

In first case type deducted directly from initializer. If variable has no initializer then corresponded error reported. In second case type deducted from '*collection.begin()' expression.

Change-Id: Ie930add1648b99440281ae04d973fd6904bc9e46
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-01-31 10:03:36 +01:00
Eike Ziller
0651e28d04 Delay setting up the help manager.
Change-Id: I86ba3734bd9a64b7d13ce7b7171a65eeb82dfa3d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-01-30 18:18:16 +01:00
hjk
a8f97a7a18 texteditor: no need to store the wizard as plugin member
Change-Id: I4ce41f516bd361c0c58b6a0f0f3fd541126f0620
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-30 18:08:47 +01:00
hjk
b8b388a3c8 analyzer: adjust comment about usage
Change-Id: I17691e3b3b649fa24a553d49868e7440004e09c7
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 18:07:55 +01:00
Eike Ziller
9dcb65a3dc Delay autodetection of the tool chains to a point where it's needed.
Change-Id: Ic05b2ec842be1486203c3d9e6e0fc28f1fcf91b4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 18:00:36 +01:00
Denis Mingulov
a36d587ccf Fix non-needed usage of QString's fromLocal8Bit() and fromUtf8()
QString::fromLocal8Bit() and QString::fromUtf8() are much more slower
than an obvious QString::fromLatin1() and QLatin1String(), so this
commit changes some places where these functions are really not
needed.

QString::fromLatin1() is used in case if QString object is used
immediately (something like QString::fromLatin1().arg()),
QLatin1String is used otherwise like in other places (for example,
QPixmap(QLatin1String("..."))) - to allow to use default QString
constructor and work with QT_NO_CAST_FROM_ASCII.

Change-Id: Ib6eb1c61e9cb35c7c5b7569fea77c5e41d32621a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 17:50:45 +01:00
Robert Loehning
2f27c73c8e Squish: Added warning about unusable targets
Change-Id: I2796aaf40d0ffcf89aca085afdc685f57e1b4f76
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-30 17:48:56 +01:00
Tobias Hunger
2ef12d8794 Win: Add comparison operator to MSVC and WinCE tool chain
The comparison operator on the abstractmsvctoolchain is not enough.

Change-Id: I5d8db422d4a996e561a25dc754a9eba151b75ff1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-30 17:11:47 +01:00
David Schulz
e44254bb9f Find usage displays content of the first line
Task-number: QTCREATERBUG-6176

Change-Id: I1c45b951bfde0b0d33bf462f532da7cbdbaa3fe7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-30 16:08:42 +01:00
Daniel Molkentin
3fe2113a2b Fixes for bindist target.
Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 15:15:43 +01:00
Tobias Hunger
b7c322c84b MSVC: Add missing operator ==
Unbreaks MSCV toolchain registration.

Task-number: QTCREATORBUG-6875
Change-Id: I55e52251ca1621320b5f9db022bab8d79f19030e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-30 14:31:34 +01:00
Eike Ziller
9da98805dd Remove dead code.
Change-Id: Ifb5a14f587358e696eb3e199f5d223832a0c2837
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 14:08:19 +01:00
Daniel Molkentin
c03b9b0c86 Add deployartifacts command
Deploys prebuilt artifacts from remote repository.
Currently only used on Windows, includes
the 64 bit debugging helper and a stable version
of jom, taken from an external repository.

Change-Id: I9f034f184f94bf4e0b088338cde6d8e0d6c7d419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 14:06:53 +01:00
Denis Mingulov
142cee902b TextEditor: Fix incorrect dependency to CppEditor resources
TextEditor BaseHoverHandler::addF1ToToolTip() method has used
a resource from CppEditor (:/cppeditor/images/f1.png), despite
of the inverse official dependecy in PluginSpec file and other
classes.

As it is not used anywhere else - to fix the issue f1.png and
f1.svg are moved from CppEditor to TextEditor.

Change-Id: I14b542837d6337bd08e19ad72cf4a869be08465a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-30 14:06:23 +01:00
hjk
e99e435818 qtsupport: remove unneeded thing from headers, style.
Change-Id: I059af357fa772290a78f62c31cb7c532ae7d77ff
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-30 13:05:05 +01:00
Tobias Hunger
52b47364de Use QUuids to identify tool chains
Save/Restore has been updated to reflect this:

We now save manual as well as auto-detected tool chains into the user
toolChains.xml file.

When loading we load the SDK as well as the user toolChains.xml files.
We then do a autodetection run. All the tool chains restored that are
marked up as auto-detected are then checked again:
 * the tool chain was autodetected again: Throw away the newly auto-
   detected tool chain and reuse the saved one. This makes sure we
   keep the QUuid that is now part of the tool chains id.
 * the tool chain was not autodetected again: Throw away the saved
   tool chain.
 * the tool chain was newly autodetected: Add the new tool chain

We keep the old id around in the legacyId() method. It is used when
loading old .user files only. So there is no need to implement this
method for new tool chains.

Task-number: QTCREATORBUG-6702

Change-Id: Ifc0a216e5351a8a57db03615ba329e355e7d5f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 12:25:40 +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
Eike Ziller
2f021edfdd Avoid deployqtHelper_mac message when directory already exists.
Change-Id: Iff13147fd6541741b94f4bd2f611e05bd87a7885
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 10:29:04 +01:00
Friedemann Kleint
663bdbdd59 Codepaster: Compile with QT_NO_CAST_FROM_ASCII.
- Change the diff parsing to use QString reducing the
  conversions.

Change-Id: Id4d84947479a14d58b8a60157a98a56db5a89ddb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-27 21:15:14 +01:00