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
7403830055 QmlDesigner.Instances: fixing spelling mistake 
Change-Id: I26f822fac1702e83f8f39747106c0fd3ebc22202
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-05-29 18:20:57 +02:00
Thomas Hartmann
0b91475b6d QmlDesigner.Instances: fix for Mac OS and Qt 4 
The QSharedMemory implementations of Qt5 and Qt4
on Mac seem to be incompatible.

We seem to have the same bug casually for Linux.

Until we solve the real issue this serves as a quick fix.

Change-Id: I686e3e94b6bb777b96f8c68cac6036c18b8d070d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-05-29 18:20:50 +02:00
Tobias Hunger
4008061816 Qbs: Update to new way of Qbs announcing warnings 
Change-Id: Ie707a24d5a081c058f838410c1223201ca4021b3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-05-29 16:38:40 +02:00
Tobias Hunger
6567a67394 Fix possible crash in target 
We need to make sure to remove RCs we delete from the lists held in
the updateDefaultRunConfigurations method.

Change-Id: Icf7908af3554e682af6ba9101058cb210e35f999
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-29 16:38:26 +02:00
hjk
9072db09ab Debugger: Fix module listing 
Change-Id: I342e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 16:29:16 +02:00
hjk
8906b4a4c8 Debugger: Make thread switching work in LLDB interface 
Change-Id: I332e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 16:29:08 +02:00
hjk
49d48760d6 BinEditor/Debugger: Simplify signal and slot signatures 
The IEditor parameter was never used.

Change-Id: Id374d9404701131d6c3ee02ed43fdbf3e3ed8af8
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 16:28:35 +02:00
hjk
b462f37742 BinEditor: Code cosmetics 
Change-Id: I59836b26094d86699dc36e36167b025fadb7ca37
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 16:28:19 +02:00
Leena Miettinen
8ae4602a5f Doc: update Android deployment options 
Change-Id: Ie3102b4abaa496e4a08cc728effcae6362a845f4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-29 16:00:59 +02:00
hjk
b75209d653 Debugger: Cleaner shutdown of LLDB/python machinery 
Change-Id: I482e78c352066ddd05e96199fd8ead088e3e9f58
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 15:49:29 +02:00
hjk
31634a07f4 Debugger: Cleanup LLDB python startup code 
Change-Id: I682e78c352066ddd05e96199fd8ead088e3e9f55
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 15:48:54 +02:00
hjk
cc611e076f Debugger: Pass autoderef pointers down to LLDB machinery 
Change-Id: I282e78c352066ddd05e96199fd8ead088e3e9f56
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 15:48:24 +02:00
Daniel Teske
d7f96e3201 Android Deploy Options: Clean up ui 
Task-number: QTCREATORBUG-9208

Change-Id: I1b1864908a24af3cd7c576831656267a6390b583
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-05-29 15:15:56 +02:00
BogDan Vatra
0f51591ce5 Fix getBundleInformation call. 
getBundleInformation must be called synchronously

Change-Id: Iebe00295e1ef0679fdd6f9b849672d72f5ea998a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-29 15:15:32 +02:00
Robert Loehning
e259196593 Squish: Update handleDebuggerWarnings() 
Change-Id: Ifd0a9270f84abe15603cbf80ef18eb7450436c74
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 14:58:50 +02:00
David Schulz
56477d86ce Debugger: Adjust wording of symbol server dialog. 
Change-Id: I7bbfbe2a95ddb6bcfa8fcb3aca8fc9a602c20bea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 14:58:38 +02:00
Tobias Hunger
2485b76183 SVN: Always use internal diff command 
This unbreaks svn diff views for users with custom diff
commands set up in their subversion configuration.

Task-number: QTCREATORBUG-9303
Change-Id: Ie3a726f08ad39770b63e2432755467df429067f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-29 14:57:40 +02:00
Oswald Buddenhagen
cca4cbfb02 remove more pointless indirections 
Change-Id: I2f16b93261aa5cefe34f76c99db64511c7dcae4a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-05-29 14:32:22 +02:00
Leena Miettinen
3f843aca67 Doc: move Class View plugin docs to .cpp files. 
QDoc does not find docs in the .h files.
Use \brief only for namespaces, classes, enums, and properties.
Use standard wording for \brief and \fn.
Use \a and \c according to guidelines.

Fix grammar and style.

Change-Id: Ib685a03c97ef38661ecc156f61d70085514357fc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-29 14:32:07 +02:00
Sergey Shambir
0b724400aa CppTools: fixed wrong flags check. 
Change-Id: I682e78c352066ddd05e96199fd8ead088e3e9f52
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-29 14:17:50 +02:00
hjk
281c42c761 BinEditor: Rename Editor->EditorWidget, Editable->Editor 
Closer to modern naming convention.

Change-Id: I80875d865336495995e0a8ad05aaf49e22fa3fb0
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 13:51:33 +02:00
Marco Bubke
c7dd854842 QmlDesigner: Add helper functions for translated text 
Change-Id: Ib5b5037f492f7f7ee448aebd5215d28e0ccae7f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-29 12:50:59 +02:00
Marco Bubke
8934100a12 QmlDesigner: Export RewriterException 
Change-Id: I292a974647cc720279ad678426db90f77816a777
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-29 12:48:06 +02:00
hjk
14481df670 Debugger: Handle application output in LLDB interface 
Change-Id: Ie97c628ece272249c23aab6d5438555c051f5aa1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 12:24:03 +02:00
hjk
61bf74be32 Debugger: Work on LLDB event handling 
Change-Id: Ie97c628ece272249c23aab6d5438555c051f5aa8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 12:23:39 +02:00
Eike Ziller
cccc39ccc7 Version bump 
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
tqtc/v2.8.0-beta v2.8.0-beta 		2013-05-29 11:57:08 +02:00
Friedemann Kleint
e794d16ff3 tr()-fixes: Add Q_OBJECT to CdbPathsPageWidget. 
It uses tr().

Change-Id: I2094c4a5465a8d3bc691000bfc1cae4c80712200
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-29 11:28:15 +02:00
Orgad Shaneh
df5fb89800 PythonEditor: Remove pluginspec.in 
Missed in 9617005e1d

Change-Id: Ibd8eba395e138a448d7316aa64b70ff89ae60900
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-05-29 11:20:19 +02:00
hjk
8390a32131 Settings: Simplify some user code 
This is still way too much boiler plate code for the task at hand.

Change-Id: Ia03bff3d6947ea6372e3f5d0217c116728742b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-05-29 09:40:17 +02:00
Friedemann Kleint
0b225af84c Fix warnings about uninitialized variables in readonlyfilesdialog.cpp. 
readonlyfilesdialog.cpp:316:29: warning: 'type' may be used
uninitialized in this function.
readonlyfilesdialog.cpp:283:60: warning: 'result' may be used
uninitialized in this function.

Change-Id: Ib2456e64d981c5afcd3ba70cc7ef0427e98b9b4e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 09:21:22 +02:00
Christian Stenger
7bb64a58f4 Squish: Move simpleFileName() into shared script 
Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:33 +02:00
Christian Stenger
d007681b31 Squish: Improve changePermission() 
Change-Id: I3ce1691afc2fad3949d216dee37b06a33e40f6f1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:25 +02:00
Petar Perisin
86d7e28db4 Git - added submoduleDataMap to handle submodule data 
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-28 21:53:26 +02:00
Eike Ziller
5b268822cf Merge remote-tracking branch 'origin/2.8' 2013-05-28 18:30:11 +02:00
Eike Ziller
cbfcf88f7e Merge branch '2.8' of ssh://codereview.qt-project.org/qt-creator/qt-creator into 2.8 2013-05-28 18:28:51 +02:00
Eike Ziller
8d894aee02 Merge remote-tracking branch 'origin/2.7' into 2.8 
Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
 2013-05-28 18:28:00 +02:00
Tobias Hunger
ff0a5e81e2 Qt4: Fix possible crash in code updating build file action 
Change-Id: Ib0172d3030afaab2ebe875302df5beb7ec74e544
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 18:27:27 +02:00
Tobias Hunger
f1b60ae7e8 Qbs: More nodes work 
* Mark files in FileTreeNode explicitly as the cleanup will fail
  otherwise
* Mangle the basedirectory when moving nodes to unconfuse linux

Change-Id: I84186d13d1342453e9cad4065b5989d199f7a9c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 18:25:33 +02:00
Tobias Hunger
60378b43bf Qt4: Only print the filename in Build file menu entry 
Skip the rest of the absolute path.

Change-Id: I487758e872b4747e6432ddbbd3553ae4ad5f86ac
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 18:20:01 +02:00
Tobias Hunger
9dda7c28e3 Qbs: Add build file command to Build menu 
Task-number: QTCREATORBUG-9353

Change-Id: I221689ae6a37ff22528b5e009615db5bdb192488
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 18:19:53 +02:00
Daniel Teske
4d69ccb738 Remove Nokia leftovers take 2 
Change-Id: Ib5fb8e81204d3454c2972a272f3abe4c22274f7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-05-28 17:59:04 +02:00
Daniel Teske
f004619cfe .pro and .qbs files: Consistently list .mimetypes.xml files 
Change-Id: I37add98ad5b35b3d375fca721ed816124f3af7f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-28 17:58:56 +02:00
Daniel Teske
4a2d602e36 Qt4Project: Fix Add/New/Resource adding to OTHER_FILES 
Task-number: QTCREATORBUG-9385
Change-Id: Icbe7372df97a5c14ca148af0c17fb4cb0497db41
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-05-28 17:58:49 +02:00
Tobias Hunger
2159fc21f8 Qbs: Improve display of absolute directories in Projects view 
Change-Id: I89c7764f5eaa066315a00f8d3c38df3d338c2ab3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 17:21:53 +02:00
Tobias Hunger
f8b1016312 Qbs: Simplify and fix qbs node management 
The code is simpler now and also fixes a reported bug.

Task-number: QTCREATORBUG-9378
Change-Id: Ibb8cd7b074e840eb413b8d433405e47dcc63ee06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-28 17:21:41 +02:00
Friedemann Kleint
a62afa55ab Display compiler in "About Qt Creator". 
In order to determine the build environment for Qt Designer and
other plugins.

Change-Id: I10ca98481097b9425c080a08fabd08e710b6d5c2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-05-28 17:08:34 +02:00
Daniel Teske
c3523fec68 MiniProjectTargetSelector: Fix inconsitency in key handling 
The keypress event would be forwarded to QWidget::keyPressEvent, but not
the release event.

Change-Id: I98e87b9f8da1133f55b2f4fae246047db1809536
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-28 17:05:42 +02:00
Eike Ziller
aee00cfad7 ProgressManager: Give individual tasks same range in summary bar 
The total range was sum of individual ranges so far, so e.g. parsing/
2).

Change-Id: Ia9133376be3219c12101435ba2e2ae27c32df6f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-28 17:02:43 +02:00
Eike Ziller
2d3a7d432b Avoid having current editor that is not in a view. 
Was triggering soft assert when opening a session with multiple files
open, and then closing the first one.

Change-Id: I23a503904222b0126dc36d8b2dcc64021393b45c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-28 16:25:41 +02:00
Marco Bubke
2753ca94c7 QmlDesigner: Remove unused code 
Change-Id: I08e98f22d3afd5911c56f1471701587db9d9c446
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-28 15:58:55 +02:00