Commit Graph

27676 Commits

Author SHA1 Message Date
David Schulz
45b021331e Editor: Renaming Link members.
Change-Id: I1ae21152ee7b8e2a9323322575de23d77c260c72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-11 16:00:52 +01:00
Fawzi Mohamed
d078c31bfa qmljseditor: do not complete private properties
Private properties (starting with __) are not offered as completion
unless one has already typed __*

Change-log: [Qml/JS Support] Do not show properties starting with "__" in auto-completion.

Change-Id: Iecf4c2ee5c14f12a45a26479328862d6a50b3ffb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-11 15:57:55 +01:00
Robert Loehning
234b4bd928 Fixed quotes
Change-Id: Ia35af9397fe64f4bcf48717830a1a25f4d8c6c36
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-11 15:52:53 +01:00
Leena Miettinen
2a49d11ef9 UI text: fix capitalization of tooltips
Fix typos and make tooltips more consistent.

Change-Id: Icd220498138221108bf0366ca0ac5ebb1f703386
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-11 15:43:39 +01:00
Leena Miettinen
62f13deaf3 UI text: fix qmljs messages
Added punctuation.

Change-Id: I737a66bb505221ff92d295c4e4b30446a099a15b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-11 15:39:07 +01:00
Marco Bubke
3e1f2521cc Qmldesigner: Change action registration
Context variables don't worked, so the context was registered.

Change-Id: Ic0efb8dc68d4762656e7858c1011e9fb759a7d81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-11 15:36:03 +01:00
Leena Miettinen
852f947fc6 UI text: fix caps in text editor options
Change-Id: Ie4dc6f07e967a2fde1ebf5d4c9718ef2a664023b
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-11 15:35:27 +01:00
Leena Miettinen
0e4660e8a0 UI text: fix grammar in kit management
Fix grammar and capitalization in messages.

Change-Id: I22b5c6a2ed111a3ad49d3311771f7ee59d48951f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-11 15:35:11 +01:00
Friedemann Kleint
c2c0c4a15c Add QtPrintSupport conditionally if Qt4 / 5 are supported.
Change-Id: If8445b9f1b194bb3148108e4eb79cd80ad520c52
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-11 14:57:50 +01:00
Robert Loehning
b31432ea08 String fix
Change-Id: I1e735c3caa617e5255caa55c2dab2ade61ec5989
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 14:33:19 +01:00
Robert Loehning
e306fa92ce String fix
Change-Id: I180386328a79bc28f2fa9dccaf700b43164ec472
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 14:33:09 +01:00
Friedemann Kleint
3a624a37a5 Library-Wizard: Do not write module-include.
Remove baseClassModule which was used for that
purpose only.

Change-Id: Id86c9cfc160b76f936cc6b716a1e4c3e93a5261f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-11 14:13:50 +01:00
Joerg Bornemann
101b1ecf71 support backslashes in QBS_SOURCE_DIR and QBS_BUILD_DIR
Change-Id: I7d02105c43d0e104a2e5e3231ceccb78b5f3091a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 13:53:14 +01:00
Robert Loehning
e07fb8d6c5 String fix
Change-Id: I03933754e546250055c24b0753ea0bd79fa61004
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-11 13:29:21 +01:00
hjk
717f237ea0 Debugger: Better usability of separate displays
Close separate displays when watch models get destroyed, make
geometry persistent in the session.

Change-Id: I67a22b0a17fa63441073f8ad0b06bcc0f49b348c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 13:27:45 +01:00
Robert Loehning
80a4fdf329 String fix
Change-Id: Ida86e0e2968d223130d6c081364965eb6a116bcb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 12:42:20 +01:00
Daniel Teske
76e451171d Eliding Label: Set a tooltip if it elides.
Change-Id: I567a548695d709a01cc865811d268d039ceb11af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-11 12:26:38 +01:00
Kai Koehne
5be5542756 Version bump.
Change-Id: I8d00f000c618d1d781ca93efb3dd2fac60ab3507
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-11 12:04:00 +01:00
Daniel Teske
2545a32a66 Qt4Project: Fix add BuildConfiguration
The names and actual config did not agree.

Task-number: QTCREATORBUG-8562
Change-Id: I23b270199d2bea12024937e1f950eaf67873ee33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 12:02:44 +01:00
Daniel Teske
794def385b Qt Quick Wizard: Increase the stub version
Needed by 1a0bed277d

Change-Id: Ie0f521cd9e366be15b69a53e7a2d4d80873e369a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-11 12:02:21 +01:00
Daniel Teske
af820b73c7 DebuggerKitInformation: Use Eliding Label
The path to the debugger and gsbserver can get long. This prevents
scrollbars in those cases.

Change-Id: Ic8c22d764ce9d5d798ea3c8d2a9f638d51a30351
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 11:46:09 +01:00
Friedemann Kleint
fdc3f60a58 Library-Wizard: Offer Qt plugin instead of Qt 4 plugin.
Change-Id: I752283166197f00aa540ce6a3de0561318865d01
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 11:41:19 +01:00
Robert Loehning
780dcd4978 String fixes
Change-Id: I539e80440abb49bc5603c10dee4a4e21f349ec61
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:37:10 +01:00
Robert Loehning
59216c270f HTML improvement
Change-Id: I95e2628e28a48ad05bb2230aa7089dd45f615a74
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 11:35:00 +01:00
Friedemann Kleint
1b78dcca22 Extend wizard modules page.
Change-Id: I445ebd37fec4fa56f43c7dff2012d6e514014b48
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 11:31:47 +01:00
Orgad Shaneh
d8b6c19fef ExternalTools: Use tool tip for effective arguments
Having the same line twice is confusing

Change-Id: Ib85afeb1867cb5bb3fbbdff584fb63f4fe496ea8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:10:23 +01:00
Orgad Shaneh
2c68c80196 Git: Make file state resolving more accurate
Change-Id: I238ef964df126a341c87dacf9344ff1570f31845
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:10:11 +01:00
Orgad Shaneh
ae58073080 Git: Add test-case for untracked file
Change-Id: I29e0e470c926d1051cc892fbd39874d8b071268c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:10:05 +01:00
Orgad Shaneh
7eebf9abba Git: Fix preserving selection from previous submit editor
Change-Id: Ideab3cb6c9250ab45f4a896e21ffd6007d810158
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:09:54 +01:00
Przemyslaw Gorszkowski
4c800b1b5a C++: fix code completion for typedef of pointer
Fix code completion and highlighting member of typedefed pointers.
It works when typedef is inside or outside of the function.

Task-number: QTCREATORBUG-8671
Task-number: QTCREATORBUG-8672
Change-Id: I9cc87080bf443f7ffa6a90ef5ba582b87700f2db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-11 10:27:47 +01:00
Leena Miettinen
432aaf005b UI text: fix capitalization in external tool config
Change-Id: I5aeaca7e5c8d9bab910588bbd1925f9a72da4822
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-09 19:39:57 +01:00
Leena Miettinen
2473349c3d UI text: fix git cherry-picking strings
Fix grammar and capitalization.

Change-Id: Iccabb01c72783f486cdb7d574c2cbb942d4d1cfe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-09 19:27:47 +01:00
Leena Miettinen
81a69f3e42 UI text: fix Git messages
Fix capitalization and punctualization of Git messages.

Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-09 19:27:03 +01:00
Orgad Shaneh
cf1099628f Update generic highlighter definitions
Sources:
* Autoconf - http://opendesktop.org/content/show.php/Autoconf+Language+Support?content=76815
* All the rest - kate repository

All licensed under LGPL

Change-Id: I7878276d131bbbccf082d272a1f58d8dda1820d7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-09 18:24:32 +01:00
hjk
4f75077a09 DeviceSupport: Fix crash in getLocalProcessesUsingProc
This is racy, but there is not much we can do about it.
Processes can change out of our control

Change-Id: I9a2a2d20b94364790d3fda0d30db8339feb3a885
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-08 17:58:20 +01:00
Christian Kandeler
f0c797256e Fix compilation with qbs on non-Linux, non-Mac Unix-like systems.
Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-08 17:26:40 +01:00
Leena Miettinen
8eaf5bc6ea UI text: fixed zeroconf text
Fixed capitalization and punctualization of error messages.

Change-Id: I58918b7657d3371c80cc66de142007fb52b95951
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-02-08 17:18:53 +01:00
Christian Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-08 17:04:57 +01:00
Christian Stenger
dae2198346 Squish: Fix tests for disabled Madde Plugin
Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-08 17:04:49 +01:00
Leena Miettinen
d3eddd329b UI text: fixed FakeVim messages
Fixed capitalization and punctualization.

Change-Id: Ib99f8a8cef9f1b92789531aa46e964e0828eaea1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-08 16:17:28 +01:00
Oswald Buddenhagen
6c03121668 fix qt project manager not finding existing variable assignments
... by fixing parameters of QMakeParser::parsedBlock() call. this was an
omission from 00e9be4246.

Task-number: QTCREATORBUG-8320
Change-Id: Iec36e2986efc7d04d292000185db05aa24f4ee1b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-08 15:44:37 +01:00
Robert Loehning
90ffdd8a6f Squish: Updated expected project tree to fixed behavior
Task-number: QTCREATORBUG-8706
Change-Id: I0a7c3defec04417014dd185f501642ad37a12ff2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-08 15:07:26 +01:00
Sergey Shambir
68aeaa5fc4 Autotools: fixed parsing var assignment without space before =
Parser worked correctly with 'bin_PROGRAMS =', but failed on
'bin_PROGRAMS='. To reproduce problem on Ubuntu, perform 'apt-get source
gentoo' and open Makefile.am in downloaded folder as project: it will be
empty before this change.

Change-Id: I71d0866a2b9d8228ad5ac9237fa34be14b9e9b38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-08 13:16:08 +01:00
Christian Stenger
c7ca78afd0 Squish: Revert unsuccessful fix for build-machines
Change-Id: I47865c18ba24ce8a732046597fe27f32c4edf3e3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-08 13:15:19 +01:00
Orgad Shaneh
384b024c2e PlainTextEditor: Use info suppression for syntax highlighting
Remove specific setting for warning suppression and use the global one

Change-Id: I1fe2b749d960283b8414cc5db5a5a7e9f20e7740
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-02-08 13:04:54 +01:00
hjk
28b9f0f3d6 HTML5: Make wizard work with Qt 5
Change-Id: I465cb1ae5fa94cc81441d45ac4e0afe1d9245fa8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-08 12:45:16 +01:00
Tobias Hunger
d0587c951f Kit: Display warning and error icons
Display warning and error icons in the kit options page. This is more
consistent with what we do elsewhere.

Change-Id: I31786054da3ad8c55931156f0124740eea2d68d3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-08 11:27:33 +01:00
Tobias Hunger
b6ca2fc16e Kits: Make sure registered kits can not get deleted
Change-Id: I3b293ed9371b201e692fae7a7569239ebc8483e9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-08 11:27:21 +01:00
hjk
dedbcd96f0 Changelog: Fix typo
Change-Id: I01afa456b9d43cae5274c9e1f17285332c870e09
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-08 10:32:07 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication()
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-08 10:30:37 +01:00