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
Jarek Kobus
6d36b5f71b Polish Polish translations 
Change-Id: If7082613d90e79af74d7116ab53cceff10e9fa93
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-11-23 13:43:11 +01:00
Sergey Belyashov
57b737c264 Russian translation update 
Change-Id: Ia224cb5c164adae46b960a75d159d1f5a4e11d23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-22 19:29:40 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
Christian Kamm
c5ff08fe88 QmlJS: Update builtin Qt 5 qmltypes. 
In particular fix the exported methods/signals for QObject.

Task-number: QTCREATORBUG-4903
Change-Id: I8ba110eca7123cae9465083843e3e27ee29d6789
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
 2011-11-22 12:19:10 +01:00
Robert Loehning
751ac3fb85 Added missing German translations 
Change-Id: Id206ea5137e9b77e3b0e0d606de6f663c94f2450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-21 18:34:17 +01:00
Jarek Kobus
5624ac62df Update Polish translations 
Change-Id: I8a56784d124137d51200bcb34ce063062f7645bd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-11-21 15:02:25 +01:00
Robert Loehning
5ab4e69fba More fixes in German translation 
Change-Id: Iabf3c67570865859ae42e8deb9125a9c9fdcf957
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-21 13:26:44 +01:00
hjk
46eb49eafd projectmanager: re-organize New Project categories 
Change-Id: Ie549f9843db985018af380eb6105e136f21989f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-18 17:50:06 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Alessandro Portale
adc52bf783 Let the Qt Quick Wizard output import QtQuick 1.1 (instead of 1.0) 
...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or
Maemo are supposed to be targeted.

Task-Number: QTCREATORBUG-6528
Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-17 16:36:50 +01:00
Robert Loehning
5808e45768 Fixes in German translation 
Change-Id: Ib37bb88a472c8ba9f1fde097760b20e90f6bd1a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-17 16:11:48 +01:00
Christian Kamm
38d90e58d0 qmldump: Fix dumping empty names for generated QMetaObjects. 
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I81af457eed14a2f863a0a92d4f5ff69c2dc48d67
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-11-17 13:54:11 +01:00
hjk
c6ebc1c697 debugger: add display variants for assosiative containers 
Change-Id: I8ce5449bf2717e7989e401482f9dbf39fafdd7d0
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-17 13:53:29 +01:00
hjk
d625c9df73 Re-arrange CMake project template. 
Change-Id: I9351e183fe7419de2e02d65cc1b9668e463da195
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-17 13:28:12 +01:00
Yuchen Deng
75c7b5f7fd Add plain C/C++ project for CMake 
Change-Id: Id9f0982092be182b976a566d0ae5eddd11307db1
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-17 13:25:26 +01:00
hjk
2e2e83ea8a debugger: fix QSet dumper 
Task-number: QTCREATORBUG-6547
Change-Id: I567f6970ad2d89d862ed86fbaa69e7eecacb9738
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-16 16:49:58 +01:00
Alessandro Portale
b41237f01e Don't use MDeclarativeCache::qDeclarativeView() 
Commit d687d11240 unfortunately caused
two severe regressions for MeeGo:

QTCREATORBUG-6473: The application creates two QDeclarativeViews
QTCREATORBUG-6490: QDView functions inaccessible. Existing apps broken

This commit removes most of d687d11240
just leaving the boosted QApplication. Now, QmlApplicationViewer *is*
again the QDeclarativeView.

Change-Id: I219540353ff4dd1061221d6cbe69ce9a58500e91
Task-Id: QTCREATORBUG-6473
Task-Id: QTCREATORBUG-6490
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-16 13:15:04 +01:00
Orgad Shaneh
e86fc51062 Debugger: Correctly handle strings with length of exactly maxsize 
Change-Id: I666a7dd9cc6e6f56f3971c426cc697b9f2f983ff
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 09:59:46 +01:00
axasia
48e1df5c84 Update japanese translations for 2.4 
Change-Id: Iff6844df602cd4fef3e94df9ba8cf0e264f8773e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-14 19:56:28 +01:00
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