Commit Graph

31617 Commits

Author SHA1 Message Date
Christian Stenger
71e9321e49 Tests: Fix compilation of valgrind test apps on Win
Change-Id: I09ecc4b5a44bcc401e970b3da94d628877a49078
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-20 17:20:27 +02:00
BogDan Vatra
24eb1e8a7b Android: Fix OpenJDK 7 package sign.
Add "-digestalg SHA1 -sigalg MD5withRSA" to jarsign parameters as suggested by
https://code.google.com/p/android/issues/detail?id=19567

Change-Id: I0c809517d8cd3b1225b6a557f9f91227dbf42cf9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-20 16:59:58 +02:00
David Kaspar
ebb787cda9 Qnx: auto-detected BlackBerry kits have mutable Device field
Change-Id: Ie6881e6521b27926b0dd59800c61d9909709ccc0
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
2013-09-20 16:27:55 +02:00
Christian Kandeler
71b66981cc BareMetal: Fix build.
Change-Id: I8d509522f674777446767bc52e3827cc96ce8130
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-20 16:11:42 +02:00
Tobias Hunger
8e0ecb566f BareMetal: Build fix
This worked for me when I test-compiled this just before I started
to review this:-/

Change-Id: Ie62664f44688d5c97f2740c6b6a23cbbe9d7c62b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 15:11:03 +02:00
Orgad Shaneh
5dc583068a Mute MSVC safety warnings
Botan:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\xutility:2227:
warning: C4996: 'std::_Copy_impl': Function call with parameters that may be
unsafe - this call relies on the caller to check that the passed values are
correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See
documentation on how to use Visual C++ 'Checked Iterators'

c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\xutility:2212:
see declaration of 'std::_Copy_impl'

D:\dev\qt-creator\src\libs\3rdparty\botan\botan.cpp:7248: see reference
to function template instantiation
'_OutIt std::copy<const Botan::u32bit*,T*>(_InIt,_InIt,_OutIt)' being compiled
with
[
    _OutIt=Botan::word *,
    T=Botan::word,
    _InIt=const Botan::u32bit *
]

CppTools:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\xutility:2873:
warning: C4996: 'std::_Mismatch1': Function call with parameters that may be
unsafe - this call relies on the caller to check that the passed values are
correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See
documentation on how to use Visual C++ 'Checked Iterators'

C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\xutility:2856:
see declaration of 'std::_Mismatch1'

D:\dev\qt-creator\src\plugins\cpptools\symbolfinder.cpp:388: see reference to
function template instantiation 'std::pair<_Ty1,_Ty2>
std::mismatch<QString::const_iterator,QString::const_iterator>(_InIt1,_InIt1,_InIt2)'
being compiled
with
[
    _Ty1=QString::const_iterator,
    _Ty2=QString::const_iterator,
    _InIt1=QString::const_iterator,
    _InIt2=QString::const_iterator
]

Change-Id: I09a477e755c4555101b064271f10c08a69576e33
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-20 14:51:07 +02:00
Tim Sander
3fbeca21d2 add baremetal plugin
This patch adds the baremetal plugin. The baremetal plugin is for
debugging small targets with hardware debugger where the remote linux
plugin does not fit. It adds a new kit and device class of type
baremetal. The device allows entering custom gdb commands. Currently only
qmake builds are possible. To use this with smaller devices without qt
a fake-qt installation is needed. CMake and qbs is currently not
supported.

Change-Id: I86816f897a2e9ed8b95e3184387969cedf8a14d7
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 14:24:32 +02:00
Robert Loehning
ee1bac2ee6 Squish: Fix verifyBuildAndRun()
"The program has unexpectedly finished." is considered valid output,
see https://bugreports.qt-project.org/browse/QTCREATORBUG-9212

Change-Id: Ia18e2dcfccdf1bdfbbc793a01897a88c4a17eb40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-20 13:47:55 +02:00
Christian Stenger
5bf5eb17f1 Squish: Fix addBranchWildcardToRoot()
Branch information is now listed in square brackets.

Change-Id: I4f38f2a93b8029ed319fae3a7c32adc0aba50660
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-09-20 12:47:39 +02:00
Robert Loehning
5d1aece721 Squish: Fix tst_default_settings
Change-Id: I2b9e03d77df657b107bc81d3b8f16720c25b4a0e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-20 11:54:56 +02:00
Robert Loehning
0e0d8eb7bb Squish: Update editors
Change-Id: I022d0c5b2e025106860ea330f6b690842bb0558c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-20 11:54:36 +02:00
Robert Loehning
76cfe9e30e Squish: Update expected window title in tst_basic_cpp_support
Change-Id: Ic5d23a899d1b808780f76ef53c855397cc436c2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-20 10:59:51 +02:00
David Schulz
a06af35631 ProjectExplorer: Introduce DeviceProcessSignalOperation.
Every device can now return a DeviceProcessSignalOperation,
which allows to kill or interrupt processes running on the
device.

Change-Id: Idaa04ebc767e09ca167fa033ed93860b9b81479e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-20 10:48:47 +02:00
hjk
ca15d0aa95 Apply static pattern to TextEditorSetting
Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 10:28:22 +02:00
Tobias Hunger
bd10688a62 Build fix
Change-Id: I97835671805a1ba8ac456f3049cb3e477894a3c0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 10:07:38 +02:00
Tobias Hunger
958dd99b12 MiniProjectTargetSelector: Add UI for mutable elements in the kits
Not perfect yet, but mostly working.

Change-Id: Ie7525671b9b3e522197d0d8cbb6096c52e88dea7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 18:14:02 +02:00
Thomas Hartmann
6251ea0331 QmlDesigner.PropertyEditor: adding TextInputSpecifics
Change-Id: If49ee5c741c7f4f08368b40a43e3c1297acda2e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-19 18:00:22 +02:00
hjk
d3d66bb39d Debugger: Handle manually set catch breakpoint gracefully
Task-number: QTCREATORBUG-10096
Change-Id: Ia9458840247ae1815751e3c58e1f21990af0cc34
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 18:00:15 +02:00
Thomas Hartmann
a27402c7dc QmlDesigner.PropertyEditor: adding TextEditSpecifics
Change-Id: Ife23fffe553fb84b238db486b1ba09b705228e18
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-19 18:00:15 +02:00
hjk
6f626ef518 Debugger: Use existing kit chooser signal in LoadCoreDialog
Change-Id: I666c550d908fa7934d60accaffd5f7a336dc76d4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-19 16:58:32 +02:00
Tobias Hunger
f05fcdcdd5 Kits: Allow for mutable KitInformation
Mutable KitInformation are those that are supposed to be editable in more
user-accessible places (e.g. like the Mini Target Selector or similar)
than the normal kit options page.

The functionality to display these settings is not part of this patch.

Change-Id: I13446c49abf89eaf739a60dbcd01c97e2144de45
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-19 16:42:03 +02:00
hjk
6e5f4e05bb Debugger: Fix internal convienience dumper for breakpoint ids
Change-Id: I3a63ffae03f49a077d1512f141099b19b567dbc2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 16:26:48 +02:00
Thomas Hartmann
b5ef9f6db9 QmlDesigner.PropertyEditor: refactoring TextSpecifics
Change-Id: Ie752e7f26e1da427224b2b8460a3c685aaff53b6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:44 +02:00
Thomas Hartmann
660344536d QmlDesigner.PropertyEditor: adding FontSection
Change-Id: I9da1358851660e56e5298bfe58cf56725e81e439
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:39 +02:00
Thomas Hartmann
940a577755 QmlDesigner.PropertyEditor: adding standard section for text
Change-Id: I82bbb32c9b46c922dfa0163826c316638f35aa24
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:33 +02:00
Thomas Hartmann
d6e2b3a72a QmlDesigner.PropertyEditor: adding control for vertical alignment
Change-Id: I892ddd01509c7e0347670a7a329c8c2f7e0c7525
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:26 +02:00
Thomas Hartmann
6d4742a199 QmlDesigner.PropertyEditor: adding control for horizontal alignment
Change-Id: Ib9625b91e316157a3da4c09cd6c472c509c5387e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:17 +02:00
Thomas Hartmann
6c340c3031 QmlDesigner.PropertyEditor: show actual item type
We want to show the actual item type.

Change-Id: I3f977dd715bde4dd6da3b9d3e142d148461decb8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:55 +02:00
Thomas Hartmann
590aeb9dc8 QmlDesigner.PropertyEditor: fixing ButtonRow
We have to react to a change of checkedIndex

Change-Id: Icb2fd8efb236d6b2764ae901968f693f09c46d42
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:51 +02:00
Thomas Hartmann
a8ada95821 QmlDesigner.PropertyEditor: remove print statements
Some cleanup of print statements.

Change-Id: I9f1d83c988e2658c2e85f58a891c07047f4d64c1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:45 +02:00
Christian Kandeler
dcd6a9e9cf qbs project files: Remove workarounds for qbs bug.
The imports work as expected now.

Change-Id: I753483696bd30512451af4b8c39f95e30a513d40
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:28:21 +02:00
Christian Kandeler
203a775652 qbs project files: Rename defaults.js to functions.js.
The old name does not fit anymore.

Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:28:04 +02:00
Christian Kandeler
7e9a413141 Fix qbs build.
There was more stuff broken by the switch to Qt Quick 2 than were
originally noticed, and the original fix was buggy as well.

Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:27:55 +02:00
Christian Kandeler
2167788b3d qbs project files: Use FileInfo.fromWindowsSeparators().
Change-Id: I92f2d5866c721d33c86894fc65b75723c8596307
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:27:06 +02:00
Christian Kandeler
fc9347ffb1 Update qbs submodule.
Change-Id: I17ba07c9ccf884bc1c942581ec32f86058ddd071
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:26:50 +02:00
hluk
2e0508ca26 FakeVim: Handle deleted editor widget in insert mode
Change-Id: I7e6585872552a9b4a5bd126e7d01a8f9ea18339a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:18:58 +02:00
hluk
a636a933d0 FakeVim: Fix searching in visual mode and with commands
Search in visual mode should select text up to matched position.

Using commands should work with search movement; e.g. 'd2/needle<CR>'.
Commands should be also properly canceled if search movement fails.

Change-Id: Ic695dccaf3f36ccae2f2b1a93f888d5ba9805a78
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:17:37 +02:00
Marco Bubke
8c7a9a51ec QmlDesigner: Move DesignerActionManagerView in ViewManager
Change-Id: I28d1e1aff0bcb3172494c133bf383582127f28c3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-19 12:12:50 +02:00
hjk
7971b6e714 Debugger: Make dumpers a bit more Python 3.x friendly
Looks like Ubuntu 13.10 will ship GDB linked to Python 3.3.

Change-Id: I748e8461531a3554d27ebfbf7af33385f69586c0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:09:52 +02:00
Thomas Hartmann
a60a3b43a7 QmlDesigner.Rewriter: changing Q_ASSERTS to QTC_ASSERTS
These ASSERTS have no fatal consequences (data losss, guaranteed crash).
Therefore we can use QTC_ASSERT instead.

Change-Id: Ia155f23d06f41432ba7504459816f000d4fe8f11
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 10:56:56 +02:00
jkobus
5d15076ea1 Fix compilation of generichighlighter test on Windows
Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-18 17:25:41 +02:00
Nikolai Kosjar
8e62876f64 QbsProjectManager: Fix include
Change-Id: Ibe7f90fa7c4374c936dbe342ec2d3c056904d42b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-18 17:00:39 +02:00
hjk
7de31d3a15 QmlDesigner: Cleanup ResizeIndicator header
Change-Id: Id7b278cf93a8f657b6cc9d087ef5628d3e1625fe
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 14:57:05 +02:00
hjk
88b70ed8f6 QmlDesigner: Compile fix with namespaced Qt
Change-Id: I51d25ac299ecd0374ef5c01e5d4c686a8730e082
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-18 14:13:00 +02:00
Marco Bubke
91cb9b0474 QmlDesigner: Remove StatesEditorWidget in StatesEditorView
Change-Id: I2d858ed2cd90f8e4297114cc47502b5a8d57f638
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:58:19 +02:00
Thomas Hartmann
5e85fc175e QmlDesigner: Use native text rendering
Change-Id: I97f73ff82e4aac6af7f6b8d04364339ba484910a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-18 13:44:27 +02:00
Thomas Hartmann
374bedfb00 QmlDesigner.StatesEditor: create widget on demand
Otherwise the widget is created but never inserted in the widget
hierarchy, if the designer was never activated.
In this case the widget was not deleted.

Task-number: QTCREATORBUG-10169

Change-Id: Ic86d540a7044c07e272357edafd4d2f81fd1b7a4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-18 13:41:05 +02:00
Marco Bubke
062f6baca0 AmlDesigner: Refactor DesignerActionManagerView in a extra file
Change-Id: I50a74778f5fa0895110f2157728b9d99b677a6c5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:19:44 +02:00
Marco Bubke
3130aacc82 QmlDesigner: Add ContentNotEditableIndicator
If you hover over a tab the content will be visulized as non editable.

Change-Id: If7fcc8aaa319e0f952f501f6e9e2fc767b89b636
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:19:38 +02:00
Marco Bubke
2d8c0dd480 QmlDesigner: Add blur render image
To give the impression that the content is non editable.

Change-Id: I1869d02a27b2d1a7c2c12abb9a8d8d24068adf22
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 12:03:24 +02:00