feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,817 Commits 108 Branches 368 Tags
12a1ba08fa0c84644f4aa836f93af126c807daee
Commit Graph

1967 Commits

Author SHA1 Message Date
Christian Kamm
8ce573f53f QmlJS: Update builtins.qmltypes for Qt 5. 
Most important reason is the QSG -> QQuick prefix change.

Change-Id: Ib3b3a70d679807b876648accd0cf17df0eaf80aa
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-14 12:01:55 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Sergey Belyashov
d099d6856e Russian translation update 
Change-Id: I9d3c9f79ccceee8e1627b6d79f1852a21373a483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:46:48 +01:00
Victor Ostashevsky
7474e545a9 Ukrainian translation updated for 2.4 
Change-Id: I40f2f94dd07e7b7b10950a0bc4e78227f35046ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:46:30 +01:00
Beaver Xu
19db15f120 Update Chinese translaton for Qt Creator 2.4. 
Change-Id: Iddc8e574ccc6a727816e8fd4e070c9280b5be73a
Reviewed-by: Viktor Ostashevskiy <ostash@ostash.kiev.ua>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:45:48 +01:00
hjk
7a1b22c890 debugger: fix extractCharArray for e.g. empty strings 
Change-Id: I00b0dab800c2587b5f947f52f96595eefc6ca218
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 13:45:18 +01:00
hjk
371ae894f0 debugger: fix display of signal-slot connection 
Change-Id: I0923bdd0ba1166639d85f8343a5abce8f2912400
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-09 08:49:08 +01:00
hjk
0697fc5e74 debugger: use faster symbol lookup to discover dynamic type 
Change-Id: I09d2deedf9288cf930a38179e7ff6e4f8e242efc
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 20:06:05 +01:00
hjk
8cf70c8c3c debugger: fix display of dynamic type 
Change-Id: Ib8844e4b9cbfef52f9717572086d1e3bdda257ce
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 18:29:20 +01:00
Eike Ziller
144aaa8b9b Fix irritating shadow. 
Task-number: QTCREATORBUG-6444

Change-Id: Ife3fd7f469be6d4d937d75d782c13e06eea9d0a7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-11-08 15:27:54 +01:00
hjk
cc2433f79e debugger: fix display of signal-slot connection 
Change-Id: I0923bdd0ba1166639d85f8343a5abce8f2912400
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 15:20:51 +01:00
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