feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,174 Commits 108 Branches 368 Tags
b8e1860c885fe3e7cb901b96c3303dd9d70ea26c
Commit Graph

31174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Hartmann
8178e1ae5b WelcomePage: fixes for the filter combobox for examples 
"All Versions" did not work correctly and just contributed to
confusion. So it is removed. Since we need a sensible default
setting we now search for the Qt with the highest version that has
examples and demos.

Task-number: QTCREATORBUG-9531
Change-Id: I495252a99753ebe511b598c61a79bbb0cd293e40
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
 2013-06-17 16:32:40 +02:00
Orgad Shaneh
8ce981e673 Git: Fix false positive for tracking branch 
Change-Id: Ib08b5b276708a5951ed421e674a10d4763032502
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 15:51:50 +02:00
Christian Stenger
613d3c563a Squish: Make sure self._fix is not used undefined 
Change-Id: Iee34668ed77df9625fbc3b4fed13a903f2746099
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-17 15:27:45 +02:00
hjk
232d7ab8bc Debugger: Split manual QObject dumper test into smaller chunks 
Easier to track down issues if they are more isolated...

Change-Id: I89d7e5f474c08075196f9e0f2bde471fb093c7e4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-17 14:11:32 +02:00
hjk
4e9dd0db6c Debugger: Refactor QByteArray dumper 
Change-Id: I0f17a3f5f04fcf4621717b2773f843d4860d66e7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-17 14:11:11 +02:00
Tobias Hunger
321de238fe Version 13 of .user files: Upgrade RunEnvironment 
Task-number: QTCREATORBUG-9561

Change-Id: I9ae2af5db85e2d592c129c10a876cf34318232af
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-17 13:54:32 +02:00
Orgad Shaneh
744d5d51ab Git: Display tracking branch for newly created branches 
+ Get rid of a workaround done for retrieving sha

Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 13:51:27 +02:00
Tobias Hunger
40f3efbc21 User file loading: Upgrade file to version 12 of the user file 
Change-Id: I7ff429c1c82a036b944c71f5b2f969e1c6db6956
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 13:41:58 +02:00
Marco Bubke
c840b8f1c1 QmlDesigner: Fix snapping for the group box 
The transformation values are now saved in the scene space. This can have
be drawbacks in some special cases but makes the code more maintainable.

Change-Id: I616d5db0998b8654e8af98aa67d563bc5b5d59da
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-17 13:29:04 +02:00
Lorenz Haas
a338851a10 CppEditor: Insert/move member definition right after enclosing class 
When triggering move or insert definition outside and no other class
symbol is found in the file, the definition is moved or inserted right
after the enclosing Class.

Change-Id: I74ffa872015753ba7372e21b868d3cf7fa49e84a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-06-17 13:14:10 +02:00
Leena Miettinen
6558df08d0 Doc: fix capitalization in Qbs topic 
Remove a link to a subtitle that comes right below.

Change-Id: Idee6566483ac9477b77d73aa901a5f91a1ab42c2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-17 12:43:37 +02:00
Leena Miettinen
4996bc99b8 Doc: bundling Qt libraries is hidden for Qt 4 
Change-Id: I23c6ca23d8c1a6ab4b21eb46193935c7605e30b1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-17 12:40:00 +02:00
Daniel Teske
583cd11371 Android: Hide bundle qt option for Qt4 
Task-number: QTCREATORBUG-9408

Change-Id: Ie86deea4b453d3ab3ebcf359c3e0b321a2cba33e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-06-17 12:14:14 +02:00
Leena Miettinen
19027b3897 Doc: Remove link to Nokia Developer page 
Change-Id: Ia5446ec6ac94505322c9ebd0f88dead9f98f281b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-17 12:01:05 +02:00
Robert Loehning
d735f839f8 German translation improvements 
Change-Id: Ia0a46739e299b69ed8cacd95dbf5ae59e67bfb16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-06-17 11:27:09 +02:00
Orgad Shaneh
3591c1df57 Git: Disable rebase and fixup when there's a command in progress 
Change-Id: Ifa2f781cb1f31afaf7b0af4e4a0dd08fb58296d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:21:19 +02:00
Orgad Shaneh
1686e314bd Git: Use log instead of show to display commit without diff 
Change-Id: I12ff53e3375470704fb6aafa6ec0a3eaadd9aadb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:20:43 +02:00
David Schulz
2bc24b7a25 Debugger: Fix interrupting 32bit process from a 64bit creator... 
... on windows.

Change-Id: I93f5299ab7f90ed64a6369176107d7596f3b36e4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-06-17 11:20:42 +02:00
Orgad Shaneh
228851d822 VCS: Update state when configuration is changed 
Take 2

Change-Id: I08f08c4adf6ea559e84ac1f1c384b6e71f7e9d59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:20:01 +02:00
Orgad Shaneh
78be644503 Fix non-windows debug build 
MSVCParser is included for tests

Change-Id: Id5e54e147d87b1cbc78efbaa0c61bab5991793c3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:16:00 +02:00
Przemyslaw Gorszkowski
94dd4e740a C++: fix 'find usages' for templates 
Fix find usages for template class(class name and template parameters)
or template function(template parameters).

Fixed:
* marking
* find usages
* follow symbol

Change-Id: I22fdbc11260cbd8ee9aafdd76aaeee0f4f49f9fd
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-06-17 11:04:47 +02:00
Orgad Shaneh
096daac0bd Git: Execute rebase asynchronously 
Rebase --continue might request an editor, which hangs if run
synchronously

Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:56:05 +02:00
Orgad Shaneh
fc2a5d7f50 VCS: Preserve uncheckable files on submit editor refresh 
Change-Id: I652b5a96c994a13f8d0c02d850b15c5846d56e64
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:54:51 +02:00
Orgad Shaneh
9f72e43fb1 Git: Refresh log entries on fixup commit 
Change-Id: Icd14c8916dc006874b77aa922b3f1c6746e0549c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:53:14 +02:00
Orgad Shaneh
1fde77f6e8 MSVC: Normalize file path for warnings 
MSVC uses lowercase file names for some warnings (e.g. C4715)

Change-Id: If149c4c8e3bf9aa79624d9bc5fd5af22289f2929
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:52:51 +02:00
Orgad Shaneh
7ff6dcabd1 Git: Handle merge conflicts on stash pop 
Change-Id: I41a9173be2feae4ab529fd9b3f2e1e7cc5ae92ff
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:44:27 +02:00
Orgad Shaneh
dbb6bcf5b0 VcsManager: Hide unconfigured VCS message after VCS is configured 
Still requires changing editor to refresh...

Change-Id: Ia8524bfcbdbc0f6b6cff02ff373d6edab129b38a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:43:30 +02:00
Nikolai Kosjar
c7e6f56cf0 CppEditor: Add a comment in cppquickfixes.h to keep match() functions cheap 
Change-Id: I60bb01df9db9d93752f8b574dfb61d3be35b974e
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-06-17 10:37:21 +02:00
Nikolai Kosjar
46c8ae5d43 Doc: Fix "path" to Import Existing Project 
Change-Id: I79ad2360d7cebaa573199efc40bfd92a3c1f006b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-17 10:37:07 +02:00
Nikolai Kosjar
5cb22e5021 CppEditor: Fix highlighting in new split if file is changed externally 
For a new split/editor no CppHighlightingSupport was set since
onMimeTypeChanged was not called.

Now the CppHighlightingSupport is set again in the constructor. This
reverts partly

    commit 033ad887
    C++: handle file type changes for choosing highlighters

Task-number: QTCREATORBUG-9382
Change-Id: Ie79d357d570bec4920366fbd56fb67859be9b37a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-06-17 10:36:39 +02:00
hluk
ab41da6a14 FakeVim: Fix how block selection is represented in editor widget 
Change-Id: I717276610b6d403d6304bc15dba07d170da0d549
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-17 08:33:26 +02:00
Nikolai Kosjar
8180f695f1 CppEditor: Check <include path>/QSomething 
For the quick fix AddIncludeForUndefinedIdentifier, if no class is found
via the locator, check the "Qt include paths" for a header file with the
same name as the class name.

Task-number: QTCREATORBUG-9538
Change-Id: I13c86844c2ff653fa479dc91eb109af2a6d76fae
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-17 08:16:43 +02:00
Erik Verbruggen
18dcac7ad0 C++: fix encoding/conversion of built-in macros 
Task-number: QTCREATORBUG-9404

Change-Id: I732b729e64b065b4ac75c547d9370cbc64918a31
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-06-17 08:14:39 +02:00
Eike Ziller
afe1d5ee65 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
 2013-06-14 16:21:04 +02:00
Eike Ziller
42c9c96361 Merge remote-tracking branch 'origin/2.7' into 2.8 
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
 2013-06-14 16:19:14 +02:00
Leena Miettinen
3ac771ecbf Doc: rename index.html as extending-index.html 
Remove the \contextpage commands, as they are only used
in some of the files.

Task-number: QTBUG-31106
Change-Id: Iacbf15a33ab6cb426c2fbfb6fbed03310095f2ba
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-06-14 15:55:19 +02:00
Friedemann Kleint
54b1770cc9 QtSupport: Fix compilation with Qt 4. 
Introduced by b57fd37109 .

Change-Id: Ie09c764408bbe4ed1e2011cbf809aa05808cd583
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-14 15:22:53 +02:00
Orgad Shaneh
e9443ff51f Git: Show tracking branch on Branches dialog 
Simplify branch model parsing a bit

Change-Id: Id9e41c6c2769397d6eee3ab74de4afbb94111e25
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-06-14 13:50:50 +02:00
Tobias Hunger
7d300a29bf Qbs: Add support for QML debugging 
Change-Id: I3ce493274b949bf9065909337a8dd57760f1e12f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-14 13:19:30 +02:00
Daniel Teske
115b91a746 Android: Autodetect a value for OpenJDK path 
First look into the current PATH, secondly into the registry.

Change-Id: I3b1d1ebccb1a85c03979ac3d48740c3de5a6df40
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-14 13:13:25 +02:00
Daniel Teske
cb6eaa3c24 Android: Set JAVA_HOME in environment and use that environment 
Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
 2013-06-14 13:13:12 +02:00
Tobias Hunger
b57fd37109 Move qmldebugginghelper related code from Qt4PM to QtSupport 
... so that it can be reused by the QbsPM

Change-Id: I79ee1aeaf66b07878e159ac9d4aecb657bdcb7ee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-06-14 13:02:43 +02:00
Robert Loehning
4929d65e82 Translated late strings 
Change-Id: I993bec833b5d4074b4c37303b244bc2f7af8e0ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-06-14 12:42:06 +02:00
Orgad Shaneh
a60cd05855 Mercurial: Add shortcut for menu entry 
Change-Id: I4a84703e0062983067daf096a65cf8a8fe67ecfc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-14 11:03:27 +02:00
Tobias Hunger
4e559c3709 QmlDebuggingHelpers: Fix usage of flags. 
The were renamed recently.

Change-Id: Ic0dd24665c4db376514f886674317add8076a7c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-14 11:00:32 +02:00
Tobias Hunger
b1679cbec9 QmlDebugging: Fix connect statement 
Change-Id: Ia00705b69a342b375b07445c557ad11b75241d08
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-14 10:51:11 +02:00
Tobias Hunger
d40fe4f736 Revert "VCS: Update state when configuration is changed" 
The signal is not defined.

This reverts commit e9b99826f243f742a60c54cc4a54ea63d0c6a558

Change-Id: I844b3fcc95a1c690f47b1ca3aa906ab81a3b5232
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-14 10:50:48 +02:00
Orgad Shaneh
d524f37ca0 VCS: Update state when configuration is changed 
Change-Id: I6b3f924a5802521540e53aabc6905355f17f74d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-14 10:10:06 +02:00
Friedemann Kleint
f696b8d9ac Fix missing translations in Python Editor. 
Add misssing macros, fix capitalization.

Task-number: QTCREATORBUG-9541

Change-Id: I9e3c3d0f527e444f2f27e5656576bb09d256badc
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-14 09:54:25 +02:00
hjk
bba1b0932a Debugger: Enable breakpoints on throw and catch with LLDB 
Change-Id: Ia7305aa6b44b7b9edf33a6828d965ab84289e353
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-13 18:25:19 +02:00