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

22625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Schulz
f09e849c96 Highlighting single characters 
only if you're searching for whole words

Task-number: QTCREATORBUG-6372
Change-Id: I10700258cacdc5af52554824a971041d6a1c2b22
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-12 15:36:14 +01:00
Leandro Melo
f04be782ab C++: Preserve original indentation in extract function 
Also extend the refactoring changes to allow for reindenting.

Task-number: QTCREATORBUG-6797
Change-Id: I515c9a37d9e62e1d5de52ff99bd492e739a81885
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-12 15:32:02 +01:00
Tobias Hunger
80a6230144 Add some const 
Change-Id: I81173280ad3e76ef62e4aefaf6914c54cfa1eac3
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-12 14:52:58 +01:00
Friedemann Kleint
9128fc2ab0 CppEditor: Compile with QT_NO_CAST_FROM_ASCII. 
- Avoid unnecessary conversions
- Add missing tr().

Change-Id: I3c0dd627a3621929c9c6fc71db6924fa513e34a7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-12 13:50:30 +01:00
Kai Koehne
9e8f935a03 RemoteGdb: Request remote setup also if no start script should be used 
Change-Id: I75ac2792b19cdb2f06ae07a59b6c9c2b2574084a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-12 13:45:05 +01:00
Robert Loehning
dac69143af Squish: Added helper function for opening files 
Change-Id: I756822299e591010eb926ee46600f4b5231d9318
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-12 12:16:04 +01:00
Friedemann Kleint
b82475b0e9 Change asserts() to soft-asserts in Vcs-Cache. 
- Prevent crash when creating a project.
- Use QDir to normalize the path (as it is constrcuted in
  the assert anyway).
- Print proper warnings.

Change-Id: Ib6fa3c564aff20b73d6efc08ca3a13688fd97dce
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-12 11:20:57 +01:00
Kai Koehne
1bdb4a69c9 Add resolution of QTCREATORBUG-5975 to changes-2.4.1 
Change-Id: Id8c9cc05520bb4865b695de66325f732f700ea0e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-12 10:57:05 +01:00
Daniel Molkentin
92cc5146d3 Convert unixdeployqt.sh to python script compatible with windows. 
Change-Id: I6dc30b6f9ca2268257ea236a574ee9dea152daa3
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-12 10:27:03 +01:00
Alessandro Portale
a58b07cfdd Native dir separators for PluginSpecPrivate::read error output 
Forward slashes still look strange on Windows.

Change-Id: I64c6b1eb8f541a761c6534abc184ce7acb2c630c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-12 08:19:49 +01:00
hjk
4a43336ad8 debugger: make Shift-F5 exit when debugging a core file 
Task-number: QTCREATORBUG-6111
Change-Id: I18c10412ac9637261bd4d83dcd7e6bbff6fdbe03
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-11 19:29:39 +01:00
David Schulz
7abc4c18dc Set focus to the editor after selection change in outline 
Task-number: QTCREATORBUG-6306
Change-Id: Ia60193ba2c4204532798fb4f7eade434d7510ff5
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-11 18:28:47 +01:00
Thomas Hartmann
af290c14e8 WelcomeScreen: layoutfix for different languages 
The x offset was hardcoded. Using anchors instead.

Change-Id: Ie033395d7083dad3aa01e2f7367f3834389213f6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-11 17:38:31 +01:00
Thomas Hartmann
085d0a1956 WelcomePage: fix platform glitch in tab bar 
depending on the platform the tab was 1 or 2 pixels of.

Change-Id: I0f6cb3a629c4b5d586f88eefcab7c8de9ac88220
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-11 16:56:20 +01:00
hjk
9d0e65ae39 More Mac-like spacing in CheckableMessageBox. 
Task-number: QTCREATORBUG-6244

Change-Id: Ic4bb76be79dea1b220ffe3f45327176305f61e03
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-01-11 16:19:36 +01:00
Nikolai Kosjar
f75abb341e Deploy steps: Introduce SimpleBuildStepConfigWidget. 
This simplifies some deploy steps and replaces
RemoteLinuxDeployStepWidget.

Change-Id: I4ad82c498cee0f15e1c93bf915cd48355017eb84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com>
 2012-01-11 16:02:19 +01:00
Aurindam Jana
2d88b3d905 QmlDebugging: Evaluating expression 
Update Locals when evaluating expression and also when
activating a specific stack frame.

Change-Id: I40ef12e980e67add98c7cad1ec4cd615bf4763ec
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-11 16:02:17 +01:00
Aurindam Jana
8bab001016 QmlJSDebug: Add a Debug Message Client 
QDebugMessageClient uses the QDebugMessageService to
retrieve and emit the debug output.

Change-Id: Id02d148954dfa613d3fd317b4a533cfed34e345b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-11 16:02:07 +01:00
Orgad Shaneh
6a17d889d4 Git: Find correct topLevel 
Task-number: QTCREATORBUG-6756

Change-Id: Iefaa8cb112f7da6e6eb76ec852f8f61abcd626ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:43:58 +01:00
Daniel Teske
553249261d Show a message box on importing the same build twice 
Task-number: QTCREATORBUG-6788

Change-Id: I65f40c440fb5dd8927d4a1ec8cf4f352ac2eb4be
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:42:03 +01:00
Daniel Teske
28560dc39d Tweak import layout on TargetSetupPage 
Expand the import path line edit.

Change-Id: Iaa7bfd5308a2d94be9adef761499c16d918cc63d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:41:53 +01:00
Yuchen Deng
58f8d43fff Git: Fix error encoding if the source file not exist 
Change-Id: Ia98195f966e79d65f1947c638cb9aacfb9b2f309
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:36:16 +01:00
hjk
62afcd6742 ProjectExplorer: Add an option to pop up app outpuit pane when debugging 
Task-number: QTCREATORBUG-6764
Change-Id: I24620c00220adccc39271a4d8c02cd0b6aec4b78
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-11 15:29:05 +01:00
Leandro Melo
6aa06579c2 C++: Fix identifier used when finding symbol for matching class 
Inside declaration from definition quickfix.

Change-Id: Iaf1bb3c70b4c8343a04aaaaedc8416e8be55aa4d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-11 15:23:28 +01:00
hjk
680224a425 cvs: compile fix 
Change-Id: I575261808c3ac8533087c393467c190e10e0d2c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-11 14:53:01 +01:00
hjk
f29532c76b cvs: compile fix 
Change-Id: Iebf1b18439b31bcfef5ea32aada3a94919e7a7fe
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-11 14:34:46 +01:00
hjk
a6ff74c0d8 ProjectExplorer: use enum instead of QString for run mode 
Change-Id: Ia906944a489b09afdea59f74afbf759b4caebe37
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-11 13:52:26 +01:00
Leena Miettinen
2230f301ec Doc: inspecting QML at runtime 
Change-Id: I25657e7c1ecbc1aa4253fc1e0684da8531a87aac
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-11 13:48:50 +01:00
Daniel Teske
f539bfa3f4 Remove dependencies on unloadeable projects 
Task-number: QTCREATORBUG-6736

Change-Id: Icff1857a1bf44f2f2bad106c3fce8bdd3a2d2e49
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 13:37:15 +01:00
Christiaan Janssen
2ddf2a1d81 QmlProfiler: fix issues with animations in the timeline 
Change-Id: Ief2351cf7d19f580c08cc557ffa0f5975e918e56
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-11 13:36:32 +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
Nicolas Arnaud-Cormos
6f085665cf Fix issues type with ldparser. 
Sometime, in the most general case, the message is a warning, and not an error.
Two cases:
 * linker returning a message like this: 'filename: warning: description'
 * uic returns messages like this: 'Warning: description'

Change-Id: I2babe1de2753ea8b2871419f1b1405eb7ae73d48
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 13:05:12 +01:00
hjk
7986fbd08d cvs: polish style 
Change-Id: Ica92448617e46223f99a5009e4a7493b83d4cda9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-11 12:56:14 +01:00
hjk
745c58befa core: use Core::Id for IVersionControl::id() 
Change-Id: I54e17c91c3e2a69d598ed485235dbf7ec62b4615
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-11 12:56:02 +01:00
David Schulz
f6a1444088 added tooltip popup if alt-key was pressed and released 
Change-Id: I167aca3c6f0e25d9a7a76f9e0d51ae85ed1a3a8f
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-11 12:31:02 +01:00
Nicolas Arnaud-Cormos
4095b80793 Add a cache for the header/source mapping. 
Now that we are iterating all the files in the project (instead of stopping at
the first success), we need a cache to make the switching fast enough on big
projects.

Change-Id: Ib7d63c93b3303c534ca53856d96333a822046ced
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-11 11:47:54 +01:00
Nicolas Arnaud-Cormos
ab8d39ace1 Fix the switch header/source action. 
In case multiple files have the same name (in a complex project), find
the file with the most common path instead of the first one.

Change-Id: I75495dabe7ba8f5142d6b52e7c07d54d5d6f54bd
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-11 11:44:35 +01:00
hjk
2a548814a5 Mercurial: code cosmetics 
Change-Id: Id7257fc5ccdcc4d36b276278906902f12d7e8c57
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-11 11:40:41 +01:00
Christian Stenger
595f4ce2d5 Squish: Don't use expected paths if non-existent 
Change-Id: I8685a91f2e821134347ab693d415a7c26cc6c8f6
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-11 11:11:02 +01:00
hjk
443e77a47d Use QByteArray for variable names. 
Less conversions, tighter code, less to type.

Change-Id: I38eb27ca17e6f1d98cdbc41fa003cbedf0f0bb34
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-10 23:55:48 +01:00
Christian Stenger
6571e01725 Squish: Only log compile if failed or debug mode 
Change-Id: I266fb9b7796d810c98e642d3c7a3f682eb05bf6b
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-10 17:25:54 +01:00
Aurindam Jana
2bc5c81a5a ScriptConsole: Refactor extra selections code 
Change-Id: I251dc5646bfcf1da386939bb8309b8db6cd2eeaa
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-10 17:15:38 +01:00
Kai Koehne
c158ae1337 QmlProject: Make sure 'mainFile: "xxx"' is always respected 
Prevent user from overriding the file to launch through the run configuration
dialog. The old logic was broken (main file was always the editor), and
arbitrary files can now be previewed conveniently with
Tools->External->Qt Quick->Preview.

Task-number: QTCREATORBUG-6683
Change-Id: Icee1d11e5063ca634e835bb57ffc77bf973ee93f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-10 17:10:47 +01:00
Kai Koehne
ed7b5c9c75 Mdnssd: Disable gcc warnings about initialized but unused variables 
We want to stay in sync with upstream, therefore just disable the
warnings.

Change-Id: Ia49e3e5581dfe8719b622524f2484d19952b5b7b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-01-10 16:37:14 +01:00
Leandro Melo
c25f0585d1 C++: Extract function quickfix 
Task-number: QTCREATORBUG-5485

Change-Id: Ib6aaeaadad4b421480d22399392768d4bad85bda
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-10 15:31:03 +01:00
hjk
ea04aa9385 debugger: fix regression in breakpoint context menu 
Task-number: QTCREATORBUG-6790
Change-Id: Id09d6f4ad20b9fa0f4b08ad61715ea963d639f5c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-01-10 14:06:08 +01:00
Oswald Buddenhagen
109adeb157 make fixnavi deal with different conditions for prev/next links 
Change-Id: If8a47c680ea3e2cba16bf5c3168b0a70862aab47
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-10 13:46:25 +01:00
hjk
818081b32b debugger: don't accept rich text in the gdb startup commands 
Task-number: QTCREATORBUG-6771
Change-Id: I9fbb1f275561d9ea422781af3740257235269197
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-10 13:30:04 +01:00
Leandro Melo
cdaa2ddae3 Fix in Czech translation 
Shortcut was being interpreted as Shift+O instead of Ctrl+Shift+O.

Task-number: QTCREATORBUG-6747
Change-Id: I7d5fbc24df3af821e5aec5b4009954ebaab074ff
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-10 12:48:22 +01:00
Bill King
0f25f3c2cb Squish: Log screenshots on error too. 
Change-Id: Ib9b464c27595c6b5bc10985e6e5c77c41272001c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-10 12:47:29 +01:00