Commit Graph

32962 Commits

Author SHA1 Message Date
Nikolai Kosjar
f90a861ccc ProjectExplorer: Normale newlines of gcc output
...otherwise the ClangCodeModel might pass on "-DHELLO=1\r" if
MingwToolChain is used.

Change-Id: I073ba5409822fed75ee30079ef985170acf98f13
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-31 15:57:37 +01:00
Tobias Hunger
e0b31be804 Qt includes: Include qglobal.h when using QT_VERSION
Task-number: QTCREATORBUG-13280
Change-Id: I81cfe7875b1c7a1f16c13b49fe56849210db3acd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-31 15:39:51 +01:00
Daniel Teske
2978f08bfa New File Wizard: Fine tune selection of best node
If the user right clicked on a node and invoked the new dialog that way,
always consider that node even if it is deeper in the file system tree
than the new files.

Task-number: QTCREATORBUG-13215
Change-Id: Ic87033cb9a5e480eee8fb56eacad506d2fd39653
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-31 13:52:30 +01:00
Tobias Hunger
9477250b9b BuildableHelperLibrary: Remove a unused method
Change-Id: I7a6355e8491fc8d3548419106f8a0d9981015653
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-31 11:49:15 +01:00
Tobias Hunger
298d07d8c8 QtVersion: Fix detection of system Qt
We used to get a list of possible qmake file names, but now we
just get a list of filename patterns.

Task-number: QTCREATORBUG-13200
Change-Id: I9e635ec04b25139cfa8e7096173ac9e1910d0ef5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-31 11:48:36 +01:00
Orgad Shaneh
8d9066f40c TextEditor: Fix usage of value before it is assigned
Task-number: QTCREATORBUG-13268
Change-Id: If6b8543d8d61ca4388b065c375709fe22bbc8e76
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-31 10:33:51 +01:00
Christian Kandeler
4fcb49be1c qbs build: Remove outdated "minimumQtVersion" specifications.
These were added when the overall project still supported Qt 4. Now the
general requirement is even stronger than what was specified in these
plugins.

Change-Id: I71241e20a72a413d30c4e089bcc19b0762a732da
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-31 10:33:42 +01:00
David Schulz
0581f22bdc CdbExt: Add Dumper for QTimeZone.
Change-Id: Ic107154400550227dad58194aca70b5370f147bc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 08:46:57 +01:00
David Schulz
7bfa174b87 CdbExt: Fix dumping of QByteArray inside QPrivate class.
Change-Id: I9e9b7af1cc2c910b6c5865a611963b371248f90e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 08:46:52 +01:00
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
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
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
377f14aecf Merge remote-tracking branch 'origin/3.3'
Change-Id: I2c5fc730816231fed253a9a387c390386c594314
2014-10-30 13:35:01 +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
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
Christian Stenger
95d01dc392 CppEditor: Fix compile with MSVC 2010
Change-Id: I9f553d7fa23620761213df525877c694a540a652
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-29 10:54:05 +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
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
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
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
Daniel Teske
26e0617a08 AndroidDeployQtStep: Fix deployment for qt 5.3
Task-number: QTCREATORBUG-13244
Change-Id: Iad4620a07994bd8944b48a117fac6a695a866205
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-10-27 11:54:58 +01:00
David Schulz
d739c9ff73 Compile fix for the cdb extension.
The naming of the architecture subfolders have changed between the
"Debugging Tools for Windows" versions and the tools shipped with the
Windows 8 SDK.
Old names: amd64 and i386.
New names: x64 and x86.

Change-Id: Id828ba9fbb0c5074d1046ac7a710fedf07c6c984
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-27 11:00:39 +01:00
David Schulz
bdc8ceeb60 Fix detection of cdb path in qbs project file.
Change-Id: Ibd54982b371f320625ec4959367febc54dd6e79e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-27 11:00:31 +01:00
Nikita Baryshnikov
2c669e2aa2 Git: Show diff-stat in change selection dialog
To list pairs of changes/files from commit. Also replaced `log -n1' with
'show'.

Change-Id: I5f62e58c085ad45fa76acfdf5e0a273ff3fa86e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-24 17:51:59 +02:00