| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 con | d326c16747 | Version bump. | 2010-06-07 13:45:49 +02:00 |  | 
			
				
					| 
							
							
								 hjk | b1e63fff98 | doc: adjust after changes to the debugging helpers | 2010-06-07 13:18:28 +02:00 |  | 
			
				
					| 
							
							
								 hjk | 84bba817c9 | doc: adjust description of python dumper classes to reality | 2010-06-07 12:27:35 +02:00 |  | 
			
				
					| 
							
							
								 Robert Loehning | 205fd3cf5e | Doc - Avoid warnings in doc. Reviewed-by: Leena Miettinen | 2010-06-04 16:55:47 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 86d6fca776 | Doc - Update information about managing sessions and screenshots. Reviewed-by: dt | 2010-06-04 15:13:38 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 08ded66396 | Doc - Add note about finding out the Symbian platform version on a device for TRK installation. Reviewed-by: Tim Jenssen | 2010-06-04 15:13:37 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | ca1aab8be3 | Doc - Add link to platform notes. Reviewed-by: olli
Reviewed-by: Niels Weber | 2010-06-04 15:13:36 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | ca3f443a75 | Doc - Update CMake screenshots and edit related text. | 2010-06-04 15:13:35 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 890ebd6717 | Doc - Update Locator screen shots and modify related text. | 2010-06-04 15:13:34 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 111884365a | Doc - Update screenshots and some related text. | 2010-06-02 16:47:44 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 9fb4e0f237 | Doc - Hid all information related to Qt Quick by using if defined(qtquick) tags. | 2010-06-02 16:47:42 +02:00 |  | 
			
				
					| 
							
							
								 hjk | 5806009d29 | Merge remote branch 'origin/2.0' Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp | 2010-06-02 09:57:23 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 13e042737f | Doc - Edit build and run instructions for Symbian target | 2010-06-01 17:13:20 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | a3f1842325 | Doc - Change version number to v2.0 | 2010-06-01 17:13:19 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | d78e5925bf | Doc - Add information about creating Maemo installation packages. Edit instructions for setting up development environment for Maemo. Add not about encrypted keys not being supported. Reviewed-by: kh | 2010-06-01 17:13:19 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 590e8f39ad | Doc - Add a disclaimer for QDeclarative functions and documentation. | 2010-06-01 09:24:23 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 667566f774 | Doc - Added the firmware version of Nokia N900 software update release 1.2. | 2010-06-01 09:24:22 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | 7e41cdc5b9 | Doc - Update the mobile example to include instructions for testing on devices. | 2010-06-01 09:24:22 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | bf8c61bdc8 | Doc - Add firmware release for Nokia N900 software update 1.2. Update information about Maemo Emulator build target. | 2010-05-28 17:12:03 +02:00 |  | 
			
				
					| 
							
							
								 Leena Miettinen | ea54660fc0 | Doc - Add tutorials on building and running example applications and creating mobile applications. Reviewed-by: Christian Kamm | 2010-05-28 17:12:02 +02:00 |  |