feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
13,212 Commits 108 Branches 368 Tags
14ffff317cbecfe8fa36a5437ed22bd55cd2261d
Commit Graph

963 Commits

Author SHA1 Message Date
hjk
49296ae135 debugger: fix merge errors 2010-08-24 12:04:30 +02:00
Kai Koehne
849b91e574 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 
Merge latest changes of master into merge :)

Conflicts:
	doc/qtcreator.qdoc
 2010-08-23 16:31:43 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
 2010-08-23 16:00:24 +02:00
Alessandro Portale
824fd1789d Increase the heap size on Symbian. 
Task-Number: QTCREATORBUG-1997
 2010-08-23 12:13:55 +02:00
Alessandro Portale
40314f3a64 Moved main.cpp from .pri to .pro. That is a controled file. 2010-08-20 19:57:39 +02:00
Kai Koehne
3bd83a9f8a QmlJS: Update builtin type information. 
Generated with Qt from commit 00bc7129d166f8f3e1486b8bf920d77f46400a6e
(qt-releases repo)
 2010-08-20 15:21:15 +02:00
hjk
cff7191064 debugger: and another fix for QObject property dumper 2010-08-20 15:18:40 +02:00
hjk
a3804bbfe3 debugger: fix QObject identification 2010-08-19 14:06:08 +02:00
Olivier Goffart
812af85d38 qmlobserver: avoid to stream objects too often. 
Limit to once every 5 seconds
 2010-08-19 12:47:43 +02:00
Jarek Kobus
cf8af3272b Update Polish translations 2010-08-19 12:25:09 +02:00
Robert Loehning
b1bfb147fe Translations still needed in 2.0.1 
These are needed because e2347b3d92 is (and should be) in 2.0 but not in 2.0.1 branch.

Reviewed-by: Oswald Buddenhagen
 2010-08-18 18:21:19 +02:00
Oswald Buddenhagen
965a5f53e5 purge german translations from xml file 
translations should be embedded only into external xml files
 2010-08-18 16:31:07 +02:00
hjk
9e59bdf9ae debugger: fix merge 2010-08-18 10:21:05 +02:00
hjk
7d3ace50ef debugger: fix merge 2010-08-18 10:20:12 +02:00
hjk
1fba185882 debugger: fix merge 2010-08-18 10:12:03 +02:00
hjk
52e1894df4 debugger: fix merge 2010-08-18 10:09:45 +02:00
hjk
b59fa0cd8b Merge remote branch 'origin/2.0' 
Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
 2010-08-18 10:05:53 +02:00
hjk
dc804c69e5 debugger: python needs no semicolons 2010-08-18 09:52:55 +02:00
Jonathan Courtois
ffdd4110ae French translation, done by the developpez.com team. 
This is the squashed result of a team effort. Authors are:

Jonathan Courtois <jonathan.courtois@gmail.com>
Belz Guillaume <guillaume.belz@free.fr>
Cédric Bonnier <myzu69@gmail.com>
Francis Genet <francis.genet@supinfo.com>
Pierre Rossi <pierre.rossi@nokia.com>

For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

See also: http://qt.developpez.com/

Merge-request: 168
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
 2010-08-17 21:43:50 +02:00
hjk
aa16f34ec0 debugger: next attempt at robustly recognizing QObjects 
(cherry picked from commit e8eea80c3f)
 2010-08-17 16:45:58 +02:00
hjk
7aa677c4e5 debugger: fix QObject property dumper by using workaround 
As suggested by Tom T. in http://sourceware.org/bugzilla/show_bug.cgi?id=11912
(cherry picked from commit f52a88a074)

Conflicts:

	share/qtcreator/gdbmacros/dumper.py
 2010-08-17 16:32:59 +02:00
hjk
7788e95ee9 debugger: fix display of arrays of types that gdb forgot about 
(cherry picked from commit a1f2638c5f)

Conflicts:

	share/qtcreator/gdbmacros/dumper.py
 2010-08-17 15:52:01 +02:00
hjk
a1f2638c5f debugger: fix display of arrays of types that gdb forgot about 2010-08-17 15:33:28 +02:00
hjk
e8eea80c3f debugger: next attempt at robustly recognizing QObjects 2010-08-17 14:14:47 +02:00
Alessandro Portale
be9a3c94fa Remove 0.5 MB of obsolete welcome screen 2010-08-17 13:40:18 +02:00
hjk
0e3ac0beb7 debugger: improved workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=11912 2010-08-17 11:59:59 +02:00
hjk
f52a88a074 debugger: fix QObject property dumper by using workaround 
As suggested by Tom T. in http://sourceware.org/bugzilla/show_bug.cgi?id=11912
 2010-08-17 11:24:59 +02:00
Alessandro Portale
b8d4356c6f Compile (on Mac) 2010-08-16 22:02:20 +02:00
Alessandro Portale
23f771d444 Renaming functions and parameters to something better. 2010-08-16 20:40:02 +02:00
Alessandro Portale
88af981ab4 Fixing order of call to QDeclarativeView 
setSource() needs to be called *after* addImportPath.
 2010-08-16 20:28:05 +02:00
Jure Repinc
eb707d1a03 Updated Slovenian translation for Qt Creator 2.1 
Merge-request: 167
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-08-16 12:01:35 +02:00
Alessandro Portale
e81c518619 Deployment of Qml modules. 
Application logic implemented. The Wizard Ui does not expose
this feature, yet.
 2010-08-15 23:57:38 +02:00
Olivier Goffart
c2da3f682e Add missing license header 2010-08-13 15:36:13 +02:00
Friedemann Kleint
faa38be87c Debugger[Python]: Deactivate QObject-Properties temporarily 
due to it causing Windows gdb to crash.
Reviewed-by: hjk
 2010-08-13 14:50:39 +02:00
hjk
497c5191e7 debugger: make dumper work with references to QObject derived classes. 2010-08-13 13:46:38 +02:00
Oswald Buddenhagen
bbee4a6367 remove duplicated message :} 2010-08-13 13:35:14 +02:00
hjk
b1e1692e23 debugger: remove dead code 2010-08-13 13:18:02 +02:00
hjk
b5579bbaf4 debugger: make QObject dumper more robust when QtCore has no debug info 2010-08-13 13:18:02 +02:00
hjk
0a3805a175 debugger: show parents and children only for QObject itself 2010-08-13 13:18:02 +02:00
hjk
64e4a8f7ae Merge remote branch 'origin/2.0' 
Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
 2010-08-13 11:19:44 +02:00
hjk
ada42e7ee8 debugger: merge 'enum' handling with that of simple types if appropriate 2010-08-13 11:00:24 +02:00
hjk
e38dc51691 debugger: speedup dumper by using integer comparisons for simple types 2010-08-13 11:00:21 +02:00
hjk
ae55b43c37 debugger: fix display of QObject properties 
This is a backport of 5d645bfdfe
 2010-08-13 09:57:35 +02:00
hjk
5d645bfdfe debugger: fix display of QObject properties 2010-08-13 09:31:07 +02:00
shiroki
c5b027cd1f Add simplified chinese translation. 
This is a team work by shiroki@cuteqt.com, chloerei@gmail.com and
xtfllbl@hotmail.com .

Merge-request: 2173
 2010-08-12 17:07:39 +02:00
Oswald Buddenhagen
214f1978ba fix string and the source in all translations 2010-08-12 17:07:39 +02:00
hjk
aeb6479d73 debugger: try long(p) == 0 as null-check for pointers as suggested by Tom T. 2010-08-12 15:27:31 +02:00
hjk
1c303fc80e debugger: fix dumper output of QLocale::timeFormat() 2010-08-12 12:38:22 +02:00
hjk
afcc0f7bf1 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
 2010-08-12 11:07:08 +02:00
Jure Repinc
e253896b58 Updated Slovenian translation for Qt Creator 2.1 
Merge-request: 2170
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-08-11 18:29:16 +02:00