feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,967 Commits 108 Branches 368 Tags
b51ebdd1a9004e93beaba89af6017c8134b570b7
Commit Graph

354 Commits

Author SHA1 Message Date
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
Thorbjørn Lindeijer
4f52f576dd doc: Fixed shortcut mentioned to move backward for Mac OS X 
Thanks to RT200 for noticing this one.
 2010-08-02 15:14:36 +02:00
kh1
ebe2fb88f3 Remove some more NetSieben traces. 
Reviewed-by: ck
 2010-07-29 14:43:41 +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
Leena Miettinen
e12ab00ea8 Doc - Fixed UI text capitalization in Manual. 2010-07-16 15:01:30 +02:00
con
eef08b12e3 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/projectexplorer/compileoutputwindow.cpp
	src/plugins/projectexplorer/compileoutputwindow.h
	src/plugins/projectexplorer/outputwindow.cpp
	src/plugins/projectexplorer/outputwindow.h
 2010-07-16 11:50:01 +02:00
Leena Miettinen
1a34bb749d Doc - Add descriptions for new Maemo packaging options. 
Reviewed-by: Christian Kandeler
 2010-07-14 11:44:04 +02:00
Friedemann Kleint
adf2c1b0da Merge branch '2.0' 
Conflicts:
	src/plugins/qmlinspector/QmlInspector.pluginspec
 2010-07-13 15:20:54 +02:00
con
e1890a78eb Remove marker. 2010-07-13 12:34:41 +02:00
Leena Miettinen
d97284372d Doc - Add information about unlocking views in Debug mode. 
Reviewed-by: Daniel Molkentin
Task-number: QTCREATORBUG-1382
 2010-07-13 12:11:59 +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
Leena Miettinen
d1ff5f9e6d Doc - Add description of the Use debug versions of Frameworks option. 
Reviewed-by: con
 2010-07-12 15:47:50 +02:00
Leena Miettinen
43a7cbc1fe Doc - Edit instructions for configuring Qt Designer plugins on Mac OS. 
Reviewed-by: con
 2010-07-12 14:40:46 +02:00
Friedemann Kleint
a753026779 Documentation: Fix whitespace of merge request 138. 2010-07-12 10:02:01 +02:00
Tilman Skobowsky
1ee76d9dfa Add additional instructions on how to use designer plugins from within Mac version of Qt Creator 
Merge-request: 138
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2010-07-12 10:02:01 +02:00
Leena Miettinen
0ecb30a9ec Doc - Remove information about QML inspector. 2010-07-09 15:35:08 +02:00
Leena Miettinen
3cb60a65e9 Doc - Add tips and tricks. 
Reviewed-by: con
 2010-07-09 14:54:37 +02:00
Leena Miettinen
e15f07cb30 Doc - Revert information about Qt Quick visual editor for v2.2 2010-07-07 14:25:45 +02:00
Leena Miettinen
5d7f1bd0a5 Doc - Add info about layouts to the example 
Reviewed-by: Niels Weber
 2010-07-07 10:38:47 +02:00
con
6503099bec Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp
 2010-07-05 13:54:07 +02:00
Leena Miettinen
4111d8a01d Doc - Edit the introduction. 
Reviewed-by: Carsten Owerfeldt
 2010-07-02 17:17:02 +02:00
Leena Miettinen
6e91d9ea11 Doc - Removed if defines 2010-07-02 17:17:01 +02:00
Leena Miettinen
0c99b5c776 Doc - Remove most instructions for using Qt Quick visual editor. 
Reviewed-by: Kai Koehne
 2010-07-02 17:17:01 +02:00
Leena Miettinen
89f366f45e Doc - Add an image of Qt Creator and rewrite the introduction accordingly. Move text to other sections. 2010-07-02 17:16:59 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
 2010-06-30 14:25:09 +02:00
Leena Miettinen
f8023741a1 Doc - Update Qt Quick Designer instructions and screen shots. 2010-06-28 17:25:30 +02:00
Leena Miettinen
5bda801be1 Doc - Fix typo in Qt application example 2010-06-28 17:25:29 +02:00
Leena Miettinen
24a0590883 Doc - Fix if defines for Qt Quick designer. 2010-06-28 17:25:28 +02:00
Leena Miettinen
77fef85115 Doc - Rename Quick Tour and update to start from the Welcome page. 2010-06-28 17:25:28 +02:00
Leena Miettinen
07a6cc39a7 Doc - Change doc version to 2.1 2010-06-28 17:25:27 +02:00
Leena Miettinen
91763a9e4e Doc - Change the document structure 2010-06-28 17:25:26 +02:00
Leena Miettinen
08d5fbf15d Doc - Show note for v2.1 
Reviewed-by: Friedemann Kleint
 2010-06-28 17:25:25 +02:00
con
af44136e22 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
 2010-06-24 11:40:22 +02:00
Leena Miettinen
d2944d2250 Doc - Add qtquick to defines to display Qt Quick information. 2010-06-24 09:56:05 +02:00
Leena Miettinen
1ca1da262b Doc - Fixed qdoc tag issues. 2010-06-23 16:12:48 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
Leena Miettinen
a47ec389cc Doc - Add known issues in 2.0.0. 
Reviewed-by: kh
 2010-06-17 17:20:38 +02:00
Leena Miettinen
d9a690fe5f Doc - Edit information about troubleshooting connections to Maemo devices. 2010-06-17 17:20:37 +02:00
Leena Miettinen
c10d997209 Doc - Add altenative configurations for connections between Qt Creator and Maemo devices. 2010-06-17 11:30:59 +02:00
Leena Miettinen
e6e069a6f9 Doc - Add information about Remote Compiler. Add information about building for Symbian Emulator. 
Reviewed-by: Tobias Hunger
 2010-06-16 11:41:59 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
Leena Miettinen
16223cb83c Doc - Removed fixed or obsolete issues and added a new issue for v2.0.0. 
Reviewed-by: con
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
 2010-06-11 14:23:10 +02:00
Leena Miettinen
47165a9119 Doc - Fixed punctuation. 2010-06-10 14:31:12 +02:00
Leena Miettinen
2461c3dc65 Doc - Add information about testing with user data on the Nokia N900. 
Reviewed-by: Christian Kamm
 2010-06-10 14:31:11 +02:00
Leena Miettinen
dc6303c050 Doc - Update screen shots and related text. 2010-06-10 14:31:10 +02:00
Leena Miettinen
0608882080 Doc - Replace S60 with Symbian. 2010-06-10 14:31:09 +02:00
Leena Miettinen
383d9ab9e7 Doc - Add workaround for installing files on Symbian devices. 2010-06-10 14:31:09 +02:00
Leena Miettinen
8e0d6a0d94 Doc - Add information about installing Qt Mobility API libraries on Nokia N900. 
Reviewed-by: Niels Weber
Reviewed-by: Tim Jenssen
 2010-06-10 14:31:08 +02:00