Commit Graph

38529 Commits

Author SHA1 Message Date
Fawzi Mohamed 14d23dd271 iossim_1_8_2: fix compiler warning
Change-Id: I23701fe8c9934f0ad661f6c7458179eb5ab44504
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-30 19:07:14 +01:00
Tim Jenssen d14b2850e4 QmlProfiler: use qsTr just around the strings
Change-Id: I23b2fc2d1c64581dbfde9f77d8a39bc5d185bb54
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:54:25 +01:00
Tobias Hunger 7dde68996e JsonWizard: Force minimum size to something sensible
Change-Id: I8d6b6b1519dc711710ad4d28148d3e86291bae58
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:47:18 +01:00
Tim Jenssen 67fef99766 QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere

Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:47:05 +01:00
Tobias Hunger 4c737d7157 JsonWizard: Small improvement to error message
Change-Id: I54368d8f7ceba1e43b0834f106edf16e065ad32d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:46:44 +01:00
Tobias Hunger e8d02209e8 JsonWizard: Add a way to check for existence of a variable
Change-Id: Ia1368334156c33ca270b5cc7d946efcdb7b635a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:46:39 +01:00
Tobias Hunger d5b4dd65d3 QtSupport: Default to Qt5 module names
When adding includes for Qt classes with module names: Default to Qt5
names (if no Qt version ifdef is wanted).

Task-number: QTCREATORBUG-13267
Change-Id: I214315589e4876215ff5993aa91359f11c5cf8f6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:33:00 +01:00
Thomas Hartmann e8a937d82a Fixing the latest .qrc Qt Quick Application wizards
* The .ui.qml files were not properly generated.
* The .qrc file was wrong
* We have to use Window and set visible to true

Change-Id: I4617aba04048bebf744cf164013bd5af0aaadcd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-30 16:14:49 +01:00
Robert Loehning 065594174a Squish: Expect no highlighting in help
Task-number: QTCREATORBUG-13239
Change-Id: Id2e7340b0ed8baa8dff1e1dbbfb45a1219c12a63
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-30 15:00:22 +01:00
Thomas Hartmann d525d28e6f QmlPuppet: Enabling style support
If a style is activated by setting QT_QUICK_CONTROLS_STYLE we have
to use QGuiApplication instead of QApplication.

Change-Id: I138a4fb75508f989f97b207a7024a426fa379f9e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-30 14:39:01 +01:00
Thomas Hartmann 7a470e9730 Updating the .qrc based wizards to use .ui.qml files
Change-Id: I178b9cdbb895ef221d74b9aa282163307550fd13
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-30 14:16:17 +01:00
Eike Ziller 44ba5ce3fd Fix debugging in iOS Simulator
Broke with 3bafbe710f
We need to have the attachPid set with the inferiorPid after we got it
from the iossim tool.

Task-number: QTCREATORBUG-13261
Change-Id: I4f876817bed5566b5025d23416dd85676bc2e68b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-30 14:03:35 +01:00
Tobias Hunger 187d1f69fd JsonWizard: Make bool values easier to work with in string expandsion
Return an empty string for "false".

Change-Id: I54506fb3db5857786c0448b0c76114ad237ef555
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 13:44:50 +01:00
Fawzi Mohamed e62f3bc8c0 KitAreaWidget: fix crash on quit
Change-Id: I70145eae04f2fc885846215796e54578d7a9c897
Task-number: QTCREATORBUG-13258
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-30 13:44:26 +01:00
Eike Ziller 7e72b47728 Help: Remove some unnecessary direct accesses to central widget
Change-Id: I04046b792f5b5264534e2654db28fcb18638869b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-30 12:44:19 +01:00
Eike Ziller 8ab18cff2e Text browser help viewer: Remove unnecessary state.
Change-Id: Ie8ecc98a065a5f9d79be45a6921f7b2165c75ead
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-30 12:44:12 +01:00
Eike Ziller 0b3dee6e30 Help: Remove unused signal
Change-Id: I64f5faaccec513848cc2eab83f98927475e67d54
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-30 12:44:03 +01:00
Orgad Shaneh 27b0fd81a0 Git: Do not show diff for all staged files when unstaged requested
For example git rm somefile and modify another, then open the commit
editor and double-click the modified file.

Change-Id: I8c7044b4279192b95dcff4d63f48228ec4960f63
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-30 10:30:30 +01:00
Nikolai Kosjar c183386144 CppTools: Remove un-used function
Change-Id: Ib346359487cb06c0fc95ff5796e9dd6f220b9d16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-30 10:03:31 +01:00
Ulf Hermann df1e61d677 Doc: Input Events category in QML profiler timeline
Change-Id: Ia4f152e0e25cb21ad6302c1bf788faff1a84e573
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-30 09:56:10 +01:00
Ulf Hermann 540dec49a9 Doc: Details for Scene Graph profiler
There seems to be a demand for more details on the events shown in the
scene graph profiler. This change should handle that.

Change-Id: I1de95a7168d9af98d75c163bb10e56699895c7fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-30 09:55:50 +01:00
Friedemann Kleint fa4c8fbd2f Adapt README to new windeployqt usage.
Task-number: QTBUG-41670
Change-Id: Iff82dbbad2248eae8ec9af12e0d92f3e6e592d6c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-10-30 09:35:33 +01:00
Orgad Shaneh feb0f33859 TextEditor: Reslot some functions
Qt4-style [dis]connect used in EditorConfiguration

Change-Id: I3be75abd58840084472e3341472b126cc2752fab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-29 21:35:49 +01:00
Leena Miettinen 9a7f4cae00 Doc: using UI forms in Qt Quick Designer
New concept in Qt Creator 3.3 and  Qt 5.4.

Change-Id: I24cacd4c98bb6873625d5cda44a78d5ba0ad8f5b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-29 14:39:48 +01:00
Eike Ziller fd8d6e3c9a Change log additions
Change-Id: I0a9f654743a22708ec48bad55edb1c6af71d7551
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
v3.3.0-beta1
2014-10-29 09:44:30 +01:00
hjk 4f52eb373a Vcs: Pass EditorWidgetCreator as copy to factory
This is an attempt to solve QTCREATORBUG-13218.
This should not be needed.

Change-Id: Icc41d83cb051ace11708645e5de18eae70746122
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-29 08:18:11 +01:00
Orgad Shaneh 4eed483013 TextEditor: Avoid unneeded indirection
Change-Id: I1ca7b390f13a4cc99d2e642a77f3e8e11bb37bd1
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-29 07:18:43 +01:00
Eike Ziller 29d20a9f85 Temporarily (?) remove make dependencies on deployqt target
Definitely avoid deploying Qt multiple times, since
this might be a reason for code signature verification on OS X bailing
out, claiming that files have been modified.

Change-Id: Ic45b6fd4af75a3b972aec8c0b4841f0ff4e7886d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 18:00:44 +01:00
Eike Ziller acda46616b OS X: Avoid running macdeployqt twice and add more deploy debug output
Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 17:36:09 +01:00
Christian Kandeler 4958e981a0 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I949ea2bef18377c9cc5e7bea06686a3a18dde11c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-28 17:19:36 +01:00
Joerg Bornemann 0396eeb91b fix focus of the OpenEditorsWindow
Commit 4b82817391 changed the parent of
the OpenEditorsWindow to 0, which is why it didn't get the keyboard
focus anymore.

Task-number: QTCREATORBUG-13196
Change-Id: I2fbf90bebfcab251e985fb80f5dfda16fd477d1c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 16:15:34 +01:00
Robert Loehning 5a58c4080a Squish: Test renaming of includes
Change-Id: I0c3d64ae6339ff41fc742b67618efbf69998c64e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 13:57:30 +01:00
David Schulz ac07573c8b CdbExt: Determine the Qt version in static builds.
Change-Id: I3ee4e362c96fcb061f76415fe37b2c229b9896ee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 12:38:45 +01:00
David Schulz 04d8eac7a6 Cdb: Replace postCommand("g") with doContinueInferior.
Removes duplicated code and improves readability

Change-Id: Ie04e1f247540babd6a840b860f2acb602f5e831d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 12:38:30 +01:00
Christian Kandeler 865533b3a1 Disable UpdateInfo plugin also with qbs build.
Change-Id: Iad15471600866e1c28e5ab544a75c8c8d1ca9ef3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 12:01:39 +01:00
Robert Loehning bdbab9274c Squish: Wait for C++-parsing in tst_rename_file
Change-Id: I66a12ae685e6980bb9d41a1a177afc2bfa46ca98
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 11:48:52 +01:00
Eike Ziller 3335e8a475 Version bump
Change-Id: If2233d241e83f82400e4e910e405eabebf887d58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 11:28:57 +01:00
Robert Loehning 80f865c057 Squish: Test more templates
Change-Id: Ia9d5afc621b4e79417f6aa1b64b6b9d9f7b5f38a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 11:27:08 +01:00
Eike Ziller 39c8790f85 Debugger engine types: Add note about keeping compatibility
Change-Id: I8f5723d53fcfb454eca8abf55a0720f12b0423d0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-28 11:25:00 +01:00
David Schulz 9c11feac1a CdbExt: Don't add the 'd' prefix for debug builds.
Change-Id: Ifa4badd0280c4900f2caba096cd86df8eb8c8918
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-28 11:17:06 +01:00
David Schulz 58e9d4a93e Debugger: Fix crash after creator shutdown
Change-Id: I5dd95571092c9b2a9a489b87d3cd4a641b337745
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 10:07:25 +01:00
David Schulz cf47294491 Debugger: Fix attach external application.
Change-Id: I61660a3632328ddf87f5689dea00e8c132c5636c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-28 09:26:33 +01:00
David Schulz d848a1e22b Deploy the cdb extension to the lib directory.
Change-Id: Ieb6e9d51033f5265490ac0ee865e91f88dc6d9cf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-28 06:53:43 +01:00
Daniel Teske 454096b9e3 QmakeProject: Fix renaming waits 3s for reparse
Task-number: QTCREATORBUG-13176
Change-Id: Id19a08f254dfa844d4adff0baafa29986a515823
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-27 15:48:50 +01:00
Daniel Teske 4b98dee0c5 QmakeProject: SetCurrentNode after renaming
The ProjectExplorer sets the current node after renaming, but since
the qmake project manager is still parsing, that doesn't actually work.
So we do set the current node via a small hack.

Change-Id: Ideefef82740529f7acc71b4d0c467d6818a49710
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-27 15:41:35 +01:00
hjk c897307cdd Use fileSystemFriendlyName() accessor instead of member
There's some extra logic in the accessor.

Change-Id: I0d7b9a9bd2439ef7f1186662b34db85522ffa252
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-27 14:50:53 +01:00
hjk 9c72b69d71 Replace some genitive of lifeless things
Despite the trend to use it for geographic names and organizations...

Change-Id: If135e78d1777f3f7d6c1688e9007969082bf3545
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-27 14:03:56 +01:00
Christian Kandeler 7150a615b1 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I3801a73b052530d752de0716489e828751a8ef92
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-27 13:49:07 +01:00
hjk 6d47ce17cb Expand CurrentKit:* also in local kit expanders
This provides the same global fall back as the global expander
without relying on the currentKit() discovery process there.

Change-Id: I6f62e58c086ad45fa76acfdf5e0a273ff3fa86e9
Task-number: QTCREATORBUG-13231
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-10-27 12:33:16 +01:00
Daniel Teske 8f9813cefb Android: Fix wrong comparison operator
Task-number: QTCREATORBUG-13193
Change-Id: I6439e7e36d0c89db8fce706824ee9ea65d89a874
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-10-27 11:55:24 +01:00