feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
15,208 Commits 108 Branches 368 Tags
4e1452fd59ca4d66e1f2bc3b73a042d562488a0d
Commit Graph

439 Commits

Author SHA1 Message Date
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1' 
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
 2010-11-15 19:03:18 +01:00
Leena Miettinen
8276b23db0 Doc: fix a typo 2010-11-12 11:26:28 +01:00
Leena Miettinen
27a0e6e868 Doc: added a warning about opening ports 
Task-number: QTCREATORBUG-3074
Reviewed-by: Olivier Goffart
 2010-11-12 11:26:28 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Leena Miettinen
b3c2be6e20 Doc - sync up master with 2.1 
Apparently, the forward merges lost quite some information.

Reviewed-by: ossi
 2010-11-01 19:14:02 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
 2010-11-01 12:11:03 +01:00
Francois Ferrand
3b70e944a3 Support new keywords %MONTH% and %DAY% for C++ template file. 
Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-28 12:13:47 +02:00
Leena Miettinen
2be41c4046 Doc: replaced Qt Quick application tutorial 
Task-number: QTCREATORBUG-2661

Reviewed-by: Carsten Owerfeldt
 2010-10-27 17:45:41 +02:00
hjk
c5f8623b41 debugger: rename Dumper.putItem -> putSubItem, putItemHelper -> putItem 2010-10-26 15:14:06 +02:00
con
060e230040 Add a -settingspath <path> command line option. 
Useful for testing.
 2010-10-25 18:02:46 +02:00
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
 2010-10-25 11:27:30 +02:00
Leena Miettinen
05c24045b0 Doc - Qt Quick Designer UI in more detail 
Reviewed-by: Carsten Owerfeldt
 2010-10-25 11:00:54 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +02:00
Leena Miettinen
b5bb0aceee Doc - update version control system section 
Reviewed-by: Tobias Hunger
 2010-10-18 12:04:57 +02:00
Leena Miettinen
2dbbfc621f Doc - Debugging QML and Java Script 
Reviewed-by: Kai Koehne
Reviewed-by: Christiaan Janssen
 2010-10-18 11:48:44 +02:00
Leena Miettinen
b5893efe67 Doc - fix links to 4.7 docs 2010-10-18 11:48:43 +02:00
Leena Miettinen
b18bc826ab Doc - remove hyphens from sub... 2010-10-18 11:48:43 +02:00
Tobias Hunger
cf257b3a44 Doc: Update documentation on VCS 2010-10-18 10:14:56 +02:00
Leena Miettinen
410523d32d Doc - using Qt Quick Designer to create components 
Task-number: QTCREATORBUG-2661

Reviewed-by: Thomas Hartmann
 2010-10-13 17:11:11 +02:00
Leena Miettinen
39ca6b81da Doc - Maemo development is supported on Mac OS 
Reviewed-by: Maurice Kalinowski
 2010-10-13 17:11:08 +02:00
Leena Miettinen
e2aa79b403 Doc - Ubuntu 8.04 now required 
Reviewed-by: Thorbjorn Lindeijer
 2010-10-13 17:11:08 +02:00
Leena Miettinen
29e0ae06eb Doc - restriction in downloading files from help browser 
Task-number: QTCREATORBUG-2701

Reviewed-by: Friedemann Kleint
 2010-10-13 17:11:07 +02:00
Bill King
9293453ced Merge branch '2.1' 
Conflicts:
	tests/auto/fakevim/fakevim.pro
 2010-10-12 10:01:27 +02:00
Christian Kandeler
e65a180706 Maemo: Always deploy via SFTP upload. 
The UTFS stuff does not seem to be reliable enough at the moment.
Deploying is too important to take that risk.

Reviewed-by: kh1
Reviewed-by: Leena Miettinen
 2010-10-11 18:14:03 +02:00
Leena Miettinen
bfb8a68690 Doc - restructure Developing Application UI section 
Reviewed-by: Carsten Owerfeldt
 2010-10-08 16:27:22 +02:00
Leena Miettinen
4ade385bae Doc - edit Qt C++ application example 
Update screen shots

Reviewed-by: Friedemann Kleint
 2010-10-08 16:27:21 +02:00
Leena Miettinen
bbcebf266b Doc - update Battery Indicator example 
Use the new mobile project wizard to create the application.
Update example files and screen shots.

Reviewed-by: ckamm
Reviewed-by: Niels Weber
 2010-10-08 16:27:19 +02:00
Leena Miettinen
bc8c55255c Doc - update Qt Quick example 
Reviewed-by: Kai Koehne
 2010-10-08 16:27:17 +02:00
Leena Miettinen
a987e1da8f Doc - changes to Qt Quick Project wizards 
Reviewed-by: Alessandro Portale
 2010-10-08 16:27:15 +02:00
Leena Miettinen
fed9c43ff7 Doc - refactoring actions aka quick fixes 
Reviewed-by: Erik Verbruggen
 2010-10-08 16:27:13 +02:00
Leena Miettinen
01926e983f Doc - C++ code snippets 
Reviewed-by: Leandro T. C. Melo
 2010-10-08 16:27:13 +02:00
Leena Miettinen
a85bfd993a Doc - Semantic highlighting 
Reviewed-by: Erik Verbruggen
 2010-10-08 16:27:12 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
Leena Miettinen
9dfc5b1414 Doc - using advanced find to search for C++ symbols 
Fix UI text capitalization, edit text, and add screen shots.

Reviewed-by: con
 2010-10-05 10:26:26 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
 2010-10-04 16:07:46 +02:00
Leena Miettinen
02bae06191 Doc - availability of environment variables in custom build steps 
Reviewed-by: Tobias Hunger
 2010-10-04 15:24:55 +02:00
Leena Miettinen
bb543b32a3 Doc - update managing sessions section 
Task-number: QTCREATORBUG-2430

Reviewed-by: hjk
 2010-09-30 15:07:00 +02:00
Leena Miettinen
beb4af4bce Doc - Using SUBDIRS variable 
Task-number: QTCREATORBUG-2430

Reviewed-by: hjk

Reviewed-by: Jarek Kobus
 2010-09-30 15:06:59 +02:00
hjk
e6dd3ff5f0 version bump 2.0.91 -> 2.1.81 
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
 2010-09-30 13:49:10 +02:00
Leena Miettinen
4caeb6dbd4 Doc - Using namespaces in class names 
Task-number: QTCREATORBUG-2493

Reviewed-by: Erik Verbruggen
 2010-09-30 12:29:18 +02:00
Leena Miettinen
e684aebd86 Doc - New Sidebar views: Outline and Class View 
Reviewed-by: Oswald Buddenhagen
 2010-09-28 17:07:20 +02:00
Leena Miettinen
59849fbfee Doc - Validating user input in custom wizards 
Reviewed-by: Friedemann Kleint
 2010-09-28 17:07:19 +02:00
hjk
4389f02097 version bump 2.0.90 -> 2.0.91 2010-09-27 16:57:34 +02:00
Leena Miettinen
912298c7f9 Doc - Update run settings for QML Viewer 
Update screen shot.

Reviewed-by: Lasse Holmstedt
 2010-09-24 17:17:07 +02:00
Christian Kandeler
213b789ddc Documentation/debugging helpers: Fix spelling mistake. 2010-09-24 13:45:54 +02:00
Leena Miettinen
e4f805da73 Doc - using debugger from command line 
Task-number: QTCREATORBUG-2432

Reviewed-by: hjk
 2010-09-24 09:53:16 +02:00
Leena Miettinen
22a162a797 Doc - Change the structure to improve navigation 2010-09-23 17:28:59 +02:00
Leena Miettinen
e875efd449 Doc - Reorganize Debugging chapter 
To make navigation easier.

Reviewed-by: hjk
 2010-09-23 14:40:21 +02:00