feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,748 Commits 108 Branches 368 Tags
1731911c4029d1b51a226e91a702f21bd13f108a
Commit Graph

2056 Commits

Author SHA1 Message Date
hjk
332ea08142 debugger: Use Latin1 as default for char *. 
Change-Id: I5a5f76d312f97c6684542fd3e31f68f78d6acf58
Task-Number: QTCREATORBUG-5232
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 11:56:15 +01:00
Alessandro Portale
9e13fa077e Fix default mainqmlfile in the qtquickapp template 
The template itseld is a valid, working project. Since it makes
template development easier, I prefer keeping it working.

Change-Id: I1ca7815e272fb87460319a388e9c57a8e0391b96
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-08 11:48:37 +01:00
Alessandro Portale
c54444dc97 Use QString::fromLatin1 instead of QString::fromAscii 
There is no good reason to break the Qt coding style, here. The
strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell
as Ascii.

Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-08 11:48:16 +01:00
hjk
60e392423f debugger: Use Latin1 as default for char *. 
Change-Id: I5a5f76d312f97c6684542fd3e31f68f78d6acf58
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-07 10:37:20 +01:00
Alessandro Portale
b58a7aef17 QtQuick/Html apps: Fix some non-shadowbuild cases 
If the .target of a .source/.target tuple is empty, we get a "//"
in the path. Let's replace it with a "/" before string-comparing
it to another path.

If the .target is just a "." like in the HTML template code, we get
to replace a "/./" with a "/".

Change-Id: I5b6fef93c3efd5a21f9461b6e85c76f13bfb75e1
Task-Id: QTBUG-21060
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-11-04 20:08:31 +01:00
hjk
b0ca56109e debugger: do not show "*" "pseudo name" twice in dumper output 
Change-Id: Id770f4b1d75487ce23b3c9cf2d59e4877ffd0467
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-04 16:28:07 +01:00
Friedemann Kleint
d655140d34 L10n: German translation for 2.4. 
Change-Id: Ief7066b0903c6d372bcbaeccf84d2d3e55337891
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-04 15:51:05 +01:00
hjk
dfcb0529fd welcome: remove unused RatingBar, ExampleLineEdit and TagBrowser 
Change-Id: Ia254ca5147f9d1976f3e19311a1aa31c2b151d00
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-04 12:26:19 +01:00
hjk
45f6399939 debugger: workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=13380 
Task-number: QTCREATORBUG-6465
Change-Id: I98894cbd247b53e18b86ec997b9087d1f2d511f3
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit dbc84d8c1c)
 2011-11-04 07:53:01 +01:00
Alessandro Portale
f642280ee5 App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0 
Bumping the minimum required Qt version from 4.7.3 to 4.7.4,
accordingly.

Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-11-03 19:54:44 +01:00
hjk
dbc84d8c1c debugger: workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=13380 
Task-number: QTCREATORBUG-6465
Change-Id: I98894cbd247b53e18b86ec997b9087d1f2d511f3
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-03 19:22:12 +01:00
Robert Loehning
86f8f2be2e String fixes in New Project wizard 
Task-number: QTCREATORBUG-6456

Change-Id: I37cf5c8f8a91d015e6aada803ab7158a77c33e40
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-03 15:14:59 +01:00
hjk
dea23cd73e welcomescreen: remove bottom gradient in develop.qml 
Change-Id: Ia22e503a750c5475466579a3101ebc2adb13416d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-11-03 14:51:24 +01:00
Christian Kamm
a037609c3f qmldump: Add a flush to fix output redirection problems on windows. 
Task-number: QTCREATORBUG-5825
Change-Id: Ib086e8ed213738516015334736b1a2badb202993
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-03 11:17:04 +01:00
Robert Loehning
7ec73a3e16 String fixes 
Change-Id: Iffa87a0e394b799e3987fa60f0a7559d5c1d0d27
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-03 10:36:46 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
hjk
29279ab8c7 more style fixes of string literal access 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 18:20:19 +01:00
Thomas Hartmann
0c3f3c009a WelcomePage: layout fix 
Fixes a regression introduced in
44928237af

Task-number: QTCREATORBUG-6444
Change-Id: Ie92ba0be9e888e065aaa52aac41bf3338bf8aeb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-02 17:08:03 +01:00
Pawel Polanski
a558cedcd0 Symbian: A typo while including QmlJSDebugger library 
Case sensitive systems do not recognise the library

Change-Id: I59d296a3bc38669bb2dc58e0bafeafe792e41543
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-31 13:51:24 +01:00
Eike Ziller
5aca145fc7 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2011-10-28 10:17:55 +02:00
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