feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,408 Commits 108 Branches 368 Tags
ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6
Commit Graph

2336 Commits

Author SHA1 Message Date
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
hjk
60762945f7 debugger: cut-and-past-o. 
Change-Id: I32561a7fea0f85711d22ed2a46fc0dba1b8cdb27
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-28 10:04:33 +02:00
Jarek Kobus
761557d157 Update Polish translations 
Change-Id: Ia25661f3c8ce0c0dcd32145c67207df9d81d533a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-26 11:01:56 +02:00
Robert Loehning
1b76f67d76 Removed dead assignments 
Change-Id: I7cd0e127c23d209d210385906d0923bce650a3e5
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-25 13:10:55 +02:00
hjk
44928237af welcome: less artifacts in top bar 
Change-Id: I38af2be3bffccee8b3fa2f9094c21f2b06800371
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-25 10:29:06 +02:00
Sergey Belyashov
2212a419dd Updated Russian translation 
Change-Id: Ie34266234132e0f6bfec578caa3f8a6bba27f57c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-24 12:46:20 +02:00
Jarek Kobus
9d4a90decd Polish Polish translations 
Change-Id: Iadb2aae531e82eaa2a824a7b019416c53c6bbf3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-24 11:01:08 +02:00
Jarek Kobus
fe59c138a4 Update Polish translations 
Change-Id: I267392c7b988dc32d0d3cca6f07ec75b7c80a417
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-24 11:00:48 +02:00
Christian Kamm
b1915231b4 QmlJS: Fix black-on-black text with dark color schemes. 
Change-Id: Ie0eacf9677abe23e28eaa7b9491e6a21ea4f7dfc
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-21 09:41:41 +02:00
hjk
c289ac1fd9 debugger: add convienience constructor for std::strings 
Change-Id: I61454ddbe417162ab182a1541b580e4cb4c783a4
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 16:09:02 +02:00
Thomas Hartmann
bbe4cc040b WelcomePage: fix clicking on title 
Task-number: QTCREATORBUG-6348
Change-Id: I13ec93fadcfad83f248e5b5b8615cd8818f8392c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 11:21:10 +02:00
hjk
52a66bca82 welcome screnn: adjust color of vertical separator 
Change-Id: Id607064c522f9d88a981a2b2f7ff4fd75d04ead4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 17:54:10 +02:00
Eike Ziller
5dbe570f9c Fix licenses. 
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 17:41:23 +02:00
Friedemann Kleint
46a2ea97a1 Revert "L10n: Update German translation for 2.4 beta." 
This reverts commit bcfa5753620df669860e53f63eb0a3b38e021574

Change-Id: Ia9042e90333a51c62f52cfb7a8660dd747dae393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-18 16:12:21 +02:00
Friedemann Kleint
051d821296 L10n: Update German translation for 2.4 beta. 
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-18 16:10:01 +02:00
Friedemann Kleint
66f52daf00 L10n: Update German translation for 2.4 beta. 
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-18 16:07:14 +02:00
Pawel Polanski
306c859635 Symbian: Stepping into functions has been fixed 
While debugging Symbian C++ applications
stepping into functions has not been working due to
a typo in the python file

Change-Id: I76710fe3f599303059f773030e57d778164bcebb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 13:55:34 +02:00
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
 2011-10-18 13:50:38 +02:00
Thomas Hartmann
e9ff13518a QmlDesigner.propertyEditor: fix caption for BorderImage 
Change-Id: If09b81ad1e5ea0f6e5bc34633a5b65ec261944d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-18 13:30:11 +02:00
Victor Ostashevsky
dd324e0634 Ukrainian translation updated 
Debugging with GDB was translated

Merge-request: 406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I60d87b2985ed041279fb7db35d1d77338a234849
 2011-10-18 12:44:16 +02:00
Eike Ziller
8eb8368139 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
 2011-10-17 14:22:32 +02:00
hjk
2c2b3732db debugger: more robust Qt 4 vs Qt 5 detection in dumper 
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit f626168c62)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 10:26:45 +02:00
Thomas Hartmann
0945269a10 QmlDesigner.property: fix specialization of property pane 
If a super class has a specifics pane use it and only autogenerate
missing properties.

In ItemPane.qml make sure the autogenerated properties come first.
Fix the template generation. If not code for any property is generated
the template is empty.

Change-Id: Ia93c55cd9f428a5ebea12d0e807a7e9ab185f0bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-14 12:39:39 +02:00
Jarek Kobus
6a3e065903 Update Polish translations 
Change-Id: Iec9f5f1c7bac531bb5d4df74d867f760b1eca976
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-14 10:00:19 +02:00
Christian Kandeler
5c6e760d0b Harmattan: Support "no Aegis manifest file" case. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I66aa22140362141c36070ab971d2283f60bcb49d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-10-13 17:46:25 +02:00
hjk
f626168c62 debugger: more robust Qt 4 vs Qt 5 detection in dumper 
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-13 11:46:30 +02:00
Christian Kamm
437c26a092 QmlJS: Update builtins.qmltypes from Qt 5. 
Adds QSGMouseEvent for completion inside MouseArea signal handlers.

Change-Id: I3e35a9d38dbf56848b3df5714efe82dd1ea88ea7
Reviewed-on: http://codereview.qt-project.org/6402
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-12 08:43:04 +02:00
Leandro Melo
0b048986b8 Editors: Update inkpot color scheme 
Task-number: QTCREATORBUG-6267
Change-Id: Iac21c28726e5e8725ff8195027a17efa3c184706
Reviewed-on: http://codereview.qt-project.org/6453
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-11 18:19:46 +02:00
Eike Ziller
fc6a7f0dd9 Merge remote-tracking branch 'origin/2.4' 2011-10-11 16:14:33 +02:00
Friedemann Kleint
f1db83be8b Debugger/Python dumper: Fix checkRef() for Qt 5. 
See http://codereview.qt-project.org/4533
(1173d0420e341dc6d38c89e5bc4295a57da7ea74 in qtbase)

Change-Id: I13d249c592b2607ee96c2feacbaefb73dd926867
Reviewed-on: http://codereview.qt-project.org/6324
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-11 10:10:39 +02:00
Robert Loehning
a7f17f8bdb Compile fix 
Change-Id: I1999e7ccc7e7fe45d656a6aa1ed7d51d827194d7
Reviewed-on: http://codereview.qt-project.org/6367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 20:00:00 +02:00
Friedemann Kleint
dd078ede85 Debugger: Compile manual debugger tests and dumber lib with Qt5. 
Introduce conditionals in the profiles and source code to
be able to test Qt 4 and Qt 5.

Change-Id: I73df5558f2945742d3e56f94baca0ee4d5f9dab8
Reviewed-on: http://codereview.qt-project.org/6330
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 18:32:05 +02:00
Kai Koehne
43aa3afb85 WelcomeScreen: Use ListView instead of Repeater for news 
This reduces number of objects created on startup, and also
allows us to simplify the logic a bit.

Change-Id: I6c7c2c5e537ff9a1882e133551f89c056cbe4fe5
Reviewed-on: http://codereview.qt-project.org/6359
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-10 17:38:30 +02:00
Eike Ziller
9b81dc17a4 Merge remote-tracking branch 'origin/2.4' 2011-10-10 15:29:31 +02:00
Fawzi Mohamed
df4b934086 gdb: workaround to lookup anonymous namespaces 
work around for http://sourceware.org/bugzilla/show_bug.cgi?id=13269

Change-Id: Ibfaf409d48146bbed09c0e563c140a1b7a712d4f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-on: http://codereview.qt-project.org/6179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 14:36:05 +02:00
Eike Ziller
9057d87805 Merge remote-tracking branch 'origin/2.4' 2011-10-07 08:42:47 +02:00
Eike Ziller
37b05178c3 Merge remote-tracking branch 'origin/2.3' into 2.4 2011-10-07 08:42:00 +02:00
Yuchen Deng
237ddd0f91 Snippets: Add 'switch' trigger for C++ code snippets 
Change-Id: Id8f860e1469d7e01e42fb39d3273817623aeded6
Merge-request: 2207
Reviewed-on: http://codereview.qt-project.org/6166
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-06 16:46:18 +02:00
Yuchen Deng
625b0ae6eb Snippets: Put the cursor in a more useful final position 
e.g.
for (int $var$ = 0; $var$ &lt; $total$; ++$var$) {
$$
}

In final, we need put the cursor at the $$ position.
This makes the code easier to write.

Change-Id: Ied1e6f6bc15277dae43d3052bfb2543124afcb82
Merge-request: 2207
Reviewed-on: http://codereview.qt-project.org/6165
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-06 16:45:56 +02:00
Eike Ziller
ae3a833b8c Commit things that went missing from 2a4a56b2be 
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-06 09:52:22 +02:00
Jure Repinc
00b50ca5f8 Updated Slovenian translation for Qt Creator 2.3 
Change-Id: I591849cac96b11d45dc025dbd3cee64d093dfdaf
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-05 20:15:08 +02:00
Eike Ziller
2a4a56b2be Load plugins from user config directory too. 
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-05 18:32:10 +02:00
Thomas Hartmann
d74a866bc6 QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS 
Allows using qml files referencing qrc resources in the designer.

Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:17:48 +02:00
Thomas Hartmann
e2e69d3e72 QmlDesigner.instances: create working stand-in object 
Create an Item as stand-in.

Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-05 17:15:02 +02:00
Thomas Hartmann
4fdbb9a6ad WelcomePage: reducing size of view 
Otherwise we might get an unnecessary scrollbar.

Change-Id: I12ab2288a02f32f542420b0e979c24aeaa00522d
Reviewed-on: http://codereview.qt-project.org/6063
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:14:50 +02:00
Thomas Hartmann
0f62ea2597 WelcomePage: fix tabbar 
Change-Id: Ic45a2bbc4773e903d8fa955b519171bed935f38e
Reviewed-on: http://codereview.qt-project.org/6062
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-05 17:14:40 +02:00
Christian Kamm
0132e23385 Qml snippets: Improve NumberAnimation and PropertyAction. 
Change-Id: I684a764797cd75a231f3da611ca6afeabdd48f61
Reviewed-on: http://codereview.qt-project.org/5835
Reviewed-by: Lasse Holmstedt
 2011-10-05 09:07:29 +02:00
Christian Kamm
5ce24ce06a Qml plugin wizard: Add uri annotation. 
Change-Id: Ie207fe674ac92b5cbcace054f452dec5300e1222
Reviewed-on: http://codereview.qt-project.org/5833
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-04 10:32:29 +02:00
hjk
70aa191b34 plain c++ app wizard: change name from 'qmake console' 
Change-Id: I1e3b094c70d8f887d3cd451c961ae067b4423289
Reviewed-on: http://codereview.qt-project.org/5467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-29 16:42:39 +02:00
Thomas Hartmann
e108cf435d WelcomePage: hide buttons if not enough space 
Change-Id: Ib33ddc8e060c2542e98dbf10b52efcfc3f010309
Reviewed-on: http://codereview.qt-project.org/5732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-29 08:49:16 +02:00