feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,683 Commits 108 Branches 368 Tags
abfa553986923613fb8147f6663bc9773edded9c
Commit Graph

32683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolai Kosjar
580791ff9f CppEditor: Do not return double entries in FunctionHelper::overrides() 
Change-Id: I568cdb842fd823067514dd4b2e983e6bd19eebca
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-10-24 11:47:15 +02:00
Tobias Nätterlund
5c28544a16 QNX: Fix broken environment 
On systems where QNX_HOST (et al.) are already set by the QNX SDP
installer, just appending to QNX_HOST collides with finding the
Connect.jar package when connecting to a device.

Change-Id: I5d3547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-10-24 11:38:49 +02:00
hjk
1daac29647 Debugger: More QRegion dumper fixes 
Change-Id: I01aaba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-24 11:37:50 +02:00
Eike Ziller
4161a528a3 Increase preference dialog height by 10% on Mac 
Widgets and layouts take more space on Mac than on the other platforms,
and that results in developers designing pages that are too heigh for
Mac even though they fit on other platforms. Since redesigning
preference pages so they also fit on Mac all the time is not ideal,
simply account for the larger needed space.

Change-Id: Ib8483713f562436bc9a86063f345ae4e44473608
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-10-24 11:14:03 +02:00
Christian Kandeler
37e3bedbe4 QmlJS: Fix autotest. 
Change-Id: I0f7aba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-10-24 11:00:30 +02:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages. 
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-24 10:50:56 +02:00
Orgad Shaneh
4de3b94840 Crossify normalizePathName 
Denoise usages

get{Short|Long}PathName are now static. They're not used anywhere except
in normalizePathName.

Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-24 10:38:36 +02:00
Eike Ziller
bc81930f17 Give preprocessor dialog button a tool tip. 
Change-Id: Iad756a8f18736da79cca63232eb00fcee8a2f38c
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-24 10:26:27 +02:00
Marco Bubke
a2c0b91ec5 QmlDesigner: Disable componentComplete for primitive creation 
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-24 09:48:04 +02:00
Marcel Krems
6f6f970afb Fix calculation of compiler string for VS 2013. 
Change-Id: I451f21732f6c7d9cc7c205a126985f1dc1122578
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-10-24 09:00:51 +02:00
Eike Ziller
c3119d1aa7 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
 2013-10-24 08:56:29 +02:00
hjk
b889bb1608 Debugger: Make QRegion dumper more independent of debuginfo 
Change-Id: I332e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 19:27:33 +02:00
hjk
c60cc101dd Debugger: More robust type lookup in QHashIterator dumper 
LLDB needs exact matches of spaces

Change-Id: I442e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 19:27:25 +02:00
hjk
a912c8255d Debugger: Split Bitfields dumper test 
LLDB appends the ':1' to types, GDB not.

Change-Id: I6a2e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 19:27:16 +02:00
Thomas Hartmann
f2634b316a QmlDesigner.PropertyEditor: fix property name in LayoutSection 
Change-Id: I3ca4d1930a90c9d84019061f32a8d34d646fce98
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 18:01:25 +02:00
hjk
0614587ebf Debugger: Use more robust way to look up QMapNode types 
LLDB needs exactly the same spacing as in the debug info.

Change-Id: I8a2e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 17:52:15 +02:00
Thomas Hartmann
120d56c116 QmlDesigner.PropertyEditor: bringing back the templates 
Template for auto generates pages now work with in Qt Quick 2.

Change-Id: Idd0a8fe8d82555bc69b192b21df7641dcdb634b4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 17:45:31 +02:00
Thomas Hartmann
c0cae37d6a QmlDesigner.PropertyEditor: fixing color editing 
Change-Id: I3102799952bace9c052f70f52489f5d768621f25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 17:44:53 +02:00
Thomas Hartmann
f06d1ae0bf QmlDesigner.PropertyEditor: cleanup of unused code 
Change-Id: Ia62b8cc0889ed6ccb83cada5718b75c5205fa2a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 17:44:43 +02:00
Thomas Hartmann
e4f4042bd6 QmlDesigner.PropertyEditor: fix names of margin properties 
Change-Id: I284b1ec1269afa38f62a3f9b2747440ce4eedc36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 17:44:34 +02:00
Christian Kandeler
bdc26d9379 Do not set the QT_CREATOR macro for the QML puppet. 
It's not Qt Creator. And otherwise the build breaks with a namespaced
Qt.

Change-Id: Ib30ef86fbc59a02f6fd60d2f0b0b8f4ab452ef6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 16:55:37 +02:00
hjk
e94e403052 Debugger: Fix QList<QStringList> dumper for LLDB 
QStringList is movable in Qt 5

Change-Id: I5b0bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 16:34:09 +02:00
Leena Miettinen
3f7b18129e Doc: update screenshot of the Welcome mode 
Change-Id: I5a2e17cd4c6a167d273f31f4e7ff63c149a5d34b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-10-23 15:48:12 +02:00
David Schulz
520c9ab342 CdbExt: Checkout branch 3.0 of binary-artifacts repository. 
Change-Id: Ice27f5cc433f436cdb0445b14ba2902c601d5295
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-23 15:37:27 +02:00
jkobus
dcaf798096 AddLibraryWizard: wrap text on snippets label 
In this way dialog doesn't grow in width when the label contains long
lines.

Change-Id: Ibd5906912c18c8e4b27959ff5a7aeda258d6995a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-23 15:31:48 +02:00
Jarek Kobus
c24eed1106 Check if project and its target are not null 
Task-number: QTCREATORBUG-10437

Fix also the code, so that we always behave like target platform, not like
host platform.

Change-Id: I4d8705ca858f9a520dcd6a780e7ba2f2dd6cb047
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-23 15:31:39 +02:00
jkobus
9795976a6b Handle MinGW case in Add Library Wizard 
Task-number: QTCREATORBUG-10423
Task-number: QTCREATORBUG-7641
Task-number: QTCREATORBUG-6093
Task-number: QTCREATORBUG-9012

Change-Id: Ibd709735fd90d635f34e42367b188fce79013fb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-23 15:31:26 +02:00
hjk
04eaf6cdfc Debugger: Make function pointers visible with LLDB 
Change-Id: I230bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 15:21:18 +02:00
Christian Kandeler
6448d26ad7 Core: Adapt documentation to recent refactoring. 
ProgressManager and ActionManager are no longer retrieved via ICore,
and most accesses do not go via the instance anymore.

Change-Id: Ib0c3033270051aaadfb25e0b2b0eaf7bdec63a1d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-23 15:10:14 +02:00
Thomas Hartmann
60710f6c05 QmlDesigner.PropertyEditor: moving the color logic into component 
Change-Id: I3d90618f5826cf77cc9813fd3b31fbfdbd5b50e7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 14:38:29 +02:00
Thomas Hartmann
8b2682b257 QmlDesigner.PropertyEditor: fixing step size for opacity 
Change-Id: I461baba451c0aed3c34ec581bccce82f954df511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 14:38:20 +02:00
Tobias Nätterlund
f02197244e QNX: Show warning when slog2info is not found on QNX >6.5 
Change-Id: Ifa66184c51144d461c351fcdf40233c39c9cf507
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-10-23 14:30:55 +02:00
hjk
231dd3f622 Debugger: Fix Int dumper on 64 bits 
Test data was wrong.

Change-Id: I530bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 14:04:13 +02:00
hjk
d61cbf1bcb Debugger: Make the QVariant-from-type-and-data universal 
Result works with GDB, too.

Change-Id: Idac1d3026054dcb1d5d030cffbe99d1d518c241b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 13:46:02 +02:00
Thomas Hartmann
ea6c6ccbe1 QmlDesigner.PropertyEditor: avoiding text eliding in LayoutSection 
Change-Id: I5635e2a304f7ad3c66d6eb17d2318af0dbd19037
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:43:02 +02:00
Thomas Hartmann
e21d11371c QmlDesigner.PropertyEditor: polishing TextEditSpecfics 
* adding TextInputSection
* moving StandardTextSection to the top
* adding ComboBox for Format

Change-Id: I730bee9c55e54f62c93a8515af0f56cdafed78bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:42:52 +02:00
Thomas Hartmann
c22e28e0e4 QmlDesigner.PropertyEditor: polish TextSpecifics 
* moving StandardTextSection to the top

Change-Id: I58f6e148389f5e073bb40c177bbf238931cf47e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:42:43 +02:00
Daniel Teske
7d42f74338 Android: Reset debugger in existing kits 
For users upgrading from a broken 3.0 beta installation

Change-Id: Ieecf38f74879d1efacbfd775ab29eba9e17a4c43
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-23 13:41:12 +02:00
Thomas Hartmann
c76e4e4234 QmlDesigner.PropertyEditor: polish TextInputSpecifics 
* adding TextInputSection
* moving StandardTextSection to the front

Change-Id: Ic6eb7aecefa63c1e7c6f003b5b8ae900291aaee1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:40:33 +02:00
Thomas Hartmann
b80b806ac9 QmlDesigner.PropertyEditor: fixing layout in ItemPane 
Change-Id: I44e9f35bfa592c015f3a089ace82c64995d89748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:40:23 +02:00
Thomas Hartmann
77095bfc9e QmlDesigner.PropertyEditor: fixing layout of GeometrySection 
Change-Id: Ic89df790be9c30cb84ce4d2ecaa7ebe5d322c9b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:40:14 +02:00
Thomas Hartmann
c932d99470 QmlDesigner.PropertyEditor: adding TextInputSection 
Change-Id: Iee3416c098608de5a76b1ef017a95efb7077c2bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:40:05 +02:00
Thomas Hartmann
922286bf1a QmlDesigner.PropertyEditor: fixing LayoutSection 
Change-Id: I8c8bcee36b2e2ee1d2e32535da135ac5182459a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 13:39:57 +02:00
hjk
a083d7368c Debugger: Make boost dumper autotests compilable on Mac 
Brew puts the headers under /usr/local/include.

Change-Id: I12ad68574586fdaf463d59b6f4dfb9149a120089
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 13:38:35 +02:00
hjk
de40fff331 Debugger: Silence some debug output 
Change-Id: I80cd68574586fdaf463d59b6f4dfb9149a120089
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 12:59:24 +02:00
hjk
07492890f7 Debugger: Add a parseAndEval implementation to the LLDB bridge 
Makes e.g. QVariant5 dumper pass

Change-Id: I8fad68574586fdaf463d59b6f4dfb9149a120089
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 12:58:38 +02:00
Erik Verbruggen
d57b405f29 CppTools: fix inclusion of "injected" defines. 
Task-number: QTCREATORBUG-10280

Change-Id: Ibc6ffeedb97a31a35a2d1f00625506f844692e16
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-10-23 12:52:40 +02:00
hjk
336644a70d Debugger: Silence IPv6 part in QVariant(QHostAddress) dumper. 
Wrong test when putting a IPv4 address in...

Change-Id: I8fcd68574586fdaf463d59b6f4dfb9149a120089
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 12:42:17 +02:00
hjk
a590f8de05 Debugger: Fix some of the array dumpers with LLDB 
Change-Id: Ie2b12a526ff7199bcadfc21a3deb5354063a3e3b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 12:41:17 +02:00
hluk
0dba50ee3d FakeVim: Scrolls correctly if text cursor moves on wrapped lines 
Change-Id: I789fc822ad4f60d7e3a39f8231d7d0cb4a78bf70
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-23 12:38:32 +02:00