feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

8660 Commits

Author SHA1 Message Date
Christian Kandeler
12b2a5fff0 Maemo: Harmattan application icons are now 80x80 pixels big. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=250237
 2011-04-29 09:45:35 +02:00
Christian Kamm
a448f2b61a QmlDump: Update for changes in qtquick2. 2011-04-28 12:19:16 +02:00
Thomas Hartmann
783779058b QmlDump: fix path import dumps on Windows 
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)

workaround: use "." imports and setting the component url.

Reviewed-by: Christian Kamm
(cherry picked from commit 0c8b4e38fa)
 2011-04-28 11:14:53 +02:00
Thomas Hartmann
0c8b4e38fa QmlDump: fix path import dumps on Windows 
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)

workaround: use "." imports and setting the component url.

Reviewed-by: Christian Kamm
 2011-04-28 10:41:26 +02:00
con
8bc8feed2d "Open Terminal Here" should open Terminal.app on Mac. 
It was starting X11 and a xterm...

Task-number: QTCREATORBUG-4683
 2011-04-27 15:30:26 +02:00
Robert Loehning
1b6b95afcc Fixed typos in German error message 
Reviewed-by: ossi
 2011-04-27 12:20:05 +02:00
con
14487af86c Merge remote branch 'origin/2.2' 
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/projectexplorer/target.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
 2011-04-27 11:27:29 +02:00
Sergey Belyashov
0f9334329d Updated Russian translation 2011-04-26 11:09:23 +02:00
Robert Loehning
a4c42ea4d9 Added missing translation 
Reviewed-by: ossi
 2011-04-21 18:58:17 +02:00
Christiaan Janssen
85801227a9 QmlDebugger: keeping watches when changing stack frames 
Reviewed-by: Kai Koehne
 2011-04-20 17:33:26 +02:00
con
e92988261e Merge remote branch 'origin/2.2' 2011-04-20 11:07:25 +02:00
Marco Bubke
a0f990ca80 QmlDesigner.PropertyEditor: More property panes 2011-04-19 17:43:45 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
501f4bba34 debugger: prevent endless loop in resolution of some types 
Reviewed-by: Friedemann Kleint
 2011-04-19 12:42:38 +02:00
hjk
fea6bcd944 debugger: enable latin1 or utf8 char[] display 2011-04-18 16:15:39 +02:00
con
5b02bf94a8 Merge remote branch 'origin/2.2' 
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2011-04-18 13:57:07 +02:00
axasia
bf511a2bcb Update japanese translation. 
Merge-request: 292
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-04-18 12:31:15 +02:00
Sergey Belyashov
d351371d81 Small correction of Russian translation 
Merge-request: 293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-04-18 12:18:09 +02:00
Alessandro Portale
3970f60814 Include touchnavigation.pri from main .pro file 
And have that entry removed by the wizard. REMOVE_NEXT_LINE
is now the keyword for line removal. INCLUDE_DEPLOYMENT_PRI
was replaced by REMOVE_NEXT_LINE.
 2011-04-17 09:55:17 +02:00
Keith Kyzivat
28843faa1c Split out touch navigation into separate files. 
Make the html5applicationviewer class much less cluttered by splitting out all
the touch navigation classes into separate files in a subdirectory.

This should make it much more maintainable.
 2011-04-16 21:13:06 +02:00
Sergey Belyashov
21639889b1 Updated Russian translation 
Merge-request: 290
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-04-15 20:31:15 +02:00
Thomas Hartmann
72235c5d28 QmlTextEditor: new icons for outline 2011-04-15 12:37:18 +02:00
Beaver Xu
4d54a56b8a Update chinese translation 
Merge-request: 287
Reviewed-by: ossi
 2011-04-14 12:58:55 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
Sergey Belyashov
0988a7c03c Updated Russian translation 
Merge-request: 2190
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-04-13 18:11:03 +02:00
hjk
4cced614dc fix script executable flags after license header changes 2011-04-13 18:00:50 +02:00
Jarek Kobus
3271a83389 Fix Polish punctuation 2011-04-13 15:14:17 +02:00
Jarek Kobus
081e300897 Update Polish translations 2011-04-13 13:12:08 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Thomas Hartmann
b00b8fce54 QmlDesigner.propertyEditor: bugfix for Rectangle.radius 
Task-number: QTCREATORBUG-4285
Reviewed-by: Marco Bubke
 2011-04-12 16:44:49 +02:00
Friedemann Kleint
67d391019b Debugger: Have Python dumper print type size information. 
For memory views. In the dumper, create a cache of TypeInfo
structs to contain type information and print the new entries
in each call of bb().

Collect the information in the gdb engine.
Replace WatchData::origAddress by WatchData::ReferencingAddress
to be able to correctly handle automatically dereferenced
pointers of the gdb engine. Whereas 'address' of a automatically
dereferenced used to be that of the pointer, it is now that
of the dereferenced item matching the size reported, enabling
memory views. Referencing address is now the address of the pointer.

Reviewed-by: hjk
 2011-04-12 15:56:03 +02:00
Friedemann Kleint
ff58d9960b L10n: Fix broken link in welcome page (tips). 
Task-number: QTCREATORBUG-4481
 2011-04-12 11:35:01 +02:00
Christiaan Janssen
76212f67b0 QmlDebugger: removed prefix in expression for locals 
Task-number: QTCREATORBUG-4462
Reviewed-by: Kai Koehne
 2011-04-11 17:27:56 +02:00
Jarek Kobus
63870572fe Polish Polish translations 2011-04-11 17:04:25 +02:00
Alessandro Portale
f1033737c7 Another fix for shadow build deployment with sh.exe in path 
The "isEmpty(QMAKE_SH)" test is nonsense in the case of an msvc
build, because for msvc, sh.exe is never executed (although QMAKE_SH
is set.

"isEqual(QMAKE_DIR_SEP, \\)" is now the ultimate test. QMAKE_DIR_SEP
will only be "/" if sh.exe is in the path AND win32-g++ is used.

Task-Number: QTCREATORBUG-4455
 2011-04-11 13:29:24 +02:00
hjk
9dc3e3ed44 debugger: fix quoting of watched expressions with funny chars inside 
Base 64 to the rescue.

Reviewed-by: con
 2011-04-08 14:46:35 +02:00
hjk
2074ec8a35 debugger: fix quoting of watched expressions with funny chars inside 
Base 64 to the rescue.
 2011-04-08 13:22:00 +02:00
Christian Kandeler
11974a1449 Mobile wizards: Don't show orientation options for Harmattan & Meego. 2011-04-07 17:26:19 +02:00
hjk
cd9aec6df9 debugger: make original value of automatically dereferenced pointer accessible 2011-04-06 18:40:32 +02:00
Bill King
5e372a165f Merge branch '2.2' 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
 2011-04-05 16:43:24 +02:00
Christian Kandeler
01bc7e7ca9 Mobile wizard: The Mainwindow sources are not versioned. 
Task-number: QTCREATORBUG-4363
Reviewed-by: Alessandro Portale
 2011-04-04 15:53:59 +02:00
Friedemann Kleint
05a6c511fa Debugger[gdb]: Fix QUrl dumper. 
"encodedOriginal" is a QByteArray.

Reviewed-by: hjk
 2011-04-04 15:14:04 +02:00
Pawel Polanski
cd9b9db64c Some texts has been updated 2011-04-04 13:35:55 +02:00
Friedemann Kleint
5cb6e9321e L10n: German translations for 2.2 2011-04-04 12:03:23 +02:00
Friedemann Kleint
5bb1ca68b0 L10n: German translations for 2.2 (string freeze). 2011-04-01 17:44:24 +02:00
Thomas Hartmann
bf1b4290bd QmlDesigner.propertyEditor: fix fill button 
The fill button should only be checked
if all 4 anchors are set and the margins are 0.

Reviewed-by: Kai Koehne
 2011-04-01 14:01:26 +02:00
Thomas Hartmann
057d4f7d96 QmlDesigner.propertyEditor: fix for scaling 
Task-number: QTCREATORBUG-4335
Reviewed-by: Kai Koehne
 2011-04-01 14:00:45 +02:00
Jarek Kobus
c526b71bbf Remove obsolete translations 2011-04-01 13:54:32 +02:00
Jarek Kobus
5e3bbdbf8f Update Polish translations 
Reviewed-by: Pawel Polanski
 2011-04-01 13:33:57 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
 2011-04-01 09:53:09 +02:00