feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4946 Commits

Author SHA1 Message Date
Alessandro Portale
c94382b8e9 Polishing the optional QMLINSPECTOR inclusion a bit 2010-08-09 12:13:29 +02:00
ck
6021a889fb QML app template: Add desktop file deployment for Maemo. 2010-08-09 12:09:35 +02:00
Pavel Fric
55164561f0 Update of czech translation for Qt Creator. 
Merge-request: 162
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-08-09 11:26:44 +02:00
Lasse Holmstedt
b5f8141fbe Whitespace fix 2010-08-06 17:49:07 +02:00
Lasse Holmstedt
4558477b01 Moved qmljsdebugger to share & debugger lib support for qml app wizard 
Reviewed-by: Alessandro Portale
 2010-08-06 17:48:01 +02:00
Thomas Hartmann
c214e473f8 QmlDesiger: fix .css of slider 
The old slider handle did not appear properly

Reviewed-by: Lasse Holmstedt
 2010-08-06 14:51:12 +02:00
Leandro Melo
9704844e47 Generic highlighter: Changes in settings. Now there's a fallbacklocation. 
Task-number: QTCREATORBUG-1886
 2010-08-06 13:19:19 +02:00
Friedemann Kleint
e179912a90 Merge remote branch 'origin/2.0' 2010-08-06 12:54:13 +02:00
Friedemann Kleint
b334002f6d I18N: Update German translations for 2.1 2010-08-06 11:19:50 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
Friedemann Kleint
111b89d755 QML: Name wizards correctly. 
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
 2010-08-05 16:54:04 +02:00
Thomas Hartmann
3ecdb94c5b QmlJsEditor.snipptes: keeping correct syntax for snippets 
Reviewed-by: Roberto Raggi
 2010-08-05 15:36:12 +02:00
Alessandro Portale
4565bc742b Move qml app templates from .qrc to share/qtcreator/templates 
Makes development easier (no recompiling needed when tweaking the
templates). Also, all other templates are in that folder.
 2010-08-03 21:54:09 +02:00
Pierre Rossi
1099fc322f Make the locale specific ts targets tolerate paths with underscores 
Reviewed-by: ossi
 2010-08-03 16:36:15 +02:00
Thorbjørn Lindeijer
6267de71d9 Added IntelliJ IDEA color scheme 
It's missing some highlights that we currently don't support, but it
comes very close.
 2010-08-03 11:37:10 +02:00
Sergey Belyashov
9f76d93e19 Updated Russian translation 
Merge-request: 157
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-07-29 11:48:11 +02:00
Christian Kamm
e03a6b6ea2 Merge branch '2.0' 
Conflicts:
	share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
	src/plugins/debugger/stackhandler.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
 2010-07-28 14:20:44 +02:00
Christian Kamm
df87d970bc QmlJS: Update builtin type information. 
Fix for 14686acb54 with corrected qmldump.
 2010-07-28 14:01:06 +02:00
Christian Kamm
14686acb54 QmlJS: Update builtin type information. 
For Qt 4.7 rev 953e91c582cd396082250748e4c4d8424292c1de
 2010-07-28 13:20:56 +02:00
con
39a8e97775 Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f' 
Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-07-26 12:26:05 +02:00
hjk
3f36dbd81a debugger: simplify code for inserting new watchitems 2010-07-23 18:20:13 +02:00
hjk
3cee7dad0a debugger: make parts of python debugger work again with the new states 2010-07-23 16:09:05 +02:00
hjk
1730141fe6 debugger: fix python dumper for std::vector<bool> 2010-07-22 19:50:09 +02:00
hjk
104751241d debugger: implement python dumper for std::vector<bool> 2010-07-22 19:47:50 +02:00
Kai Koehne
bd5512dc3b QmlOutline: Show icons also on Mac OS X 
Copy them to the .app folder ...
 2010-07-22 14:48:20 +02:00
hjk
cc0130373d debugger: try to give more error details from the python dumpers in the debugger log 2010-07-21 08:44:54 +02:00
hjk
67e263deff debugger: re-enable repeated extraction of current namespace 
More stable. Needs deeper investigation for a proper solution.
 2010-07-20 18:59:51 +02:00
Oswald Buddenhagen
21ac8dcc0a add check-ts target to assess completeness of translations 2010-07-16 16:39:51 +02:00
Oswald Buddenhagen
2d9c9cc86b add commit-ts target to commit ts files without line number info 
it is pretty pointless to commit the extracted line number information,
as it needs to be refreshed after pulling source code changes anyway. on
top of it, it bloats the repository.
 2010-07-16 16:39:51 +02:00
Oswald Buddenhagen
c7bd870ef1 add ts-untranslated target 
the generated file is not meant for committing
 2010-07-16 16:39:51 +02:00
Oswald Buddenhagen
abf94a6cdd add fine-grained ts-<lang> targets 
the old ts target is now named ts-all, and it will update even the files
which are disabled from compilation/release.
 2010-07-16 16:39:51 +02:00
Oswald Buddenhagen
a3cd6e7923 clean up string extraction from xml files 2010-07-16 16:35:27 +02:00
Alessandro Portale
b23e6b47d7 Re-enable the qml-runtime wizard. 
(cherry picked from commit 758bcff85e)
 2010-07-16 16:11:40 +02:00
Kai Koehne
dec0519b34 QmlOutline: Additional icons 2010-07-16 14:10:02 +02:00
con
1aeef8d9a1 Mac: The resources target created a phony_target.app directory. 2010-07-16 10:55:30 +02:00
Thorbjørn Lindeijer
a76773191d QML snippet: property has a name and a value, not two names 2010-07-15 16:24:01 +02:00
hjk
9f8b5af3b2 debugger: make parsing of cli-style commands in python more robust 2010-07-15 14:54:43 +02:00
Thorbjørn Lindeijer
5dd09d004a QML snippet: property has a name and a value, not two names 2010-07-15 11:53:31 +02:00
hjk
87fc54faca debugger: code cosmetics 2010-07-14 17:49:17 +02:00
hjk
47fee37832 debugger: extract the Qt namespace even if the inferior is not runnable 
That enables the python dumpers for namespaced Qt even for core files.
 2010-07-14 17:49:17 +02:00
hjk
574862ac9f debugger: disable some debug messages 2010-07-14 17:49:17 +02:00
hjk
3fcafefa9e debugger: work around failing gdb.lookup_type for arrays. 
see http://sourceware.org/bugzilla/show_bug.cgi?id=11797
 2010-07-14 17:49:16 +02:00
Kai Koehne
ce32f25ba3 QmlOutline: Show icons for known types 2010-07-14 11:40:11 +02:00
con
5c8ce80ea9 Adapt Qt Creator plugin template to match recent changes. 2010-07-13 15:25:22 +02:00
con
c3594213fd Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
 2010-07-13 11:34:44 +02:00
con
d24d01f49c Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0) 
Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
 2010-07-13 11:31:05 +02:00
hjk
ff6736fade debugger: work aroung gdb/python type lookup for arrays 2010-07-12 17:14:46 +02:00
Robert Loehning
e33b00c9ea Conditional compilation for functions which are unused on Windows 2010-07-12 16:06:21 +02:00
hjk
7eedfb72bc debugger: improve robustness in the presence of outdated debug information 2010-07-09 10:59:52 +02:00
Friedemann Kleint
ba6b52ce14 Customwizard: Add a simple preprocessor. 
Allowing for nesting sections depending on Javascript expression using
the (expanded) wizard field variables as in:

-- test.pro.template:
QT = core
@if "%NETWORK_CHECKBOX%" == "true"
QT += network
@endif
Rubber-stamped-by: Alessandro Portale <alessandro.portale@nokia.com>
 2010-07-09 08:31:46 +02:00