Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						5ad724a3ac 
					 
					
						
						
							
							Support for QML module mapping  
						
						 
						
						... 
						
						
						
						QUL uses module mapping for theming of QtQuick.Controls: during
code-generation the compiler is pointed to the Controls implementation
it should use. This is done by rewriting any import of QtQuick.Controls
with the given module name. The CMake build scripts will write a file
for each target to the directory "qml_module_mappings" in the build dir,
and those files will contain the mappings used.
Fixes: QTCREATORBUG-25356
Change-Id: I3f74897836dde7717b03bd6dffa46dcc0689ffdd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io > 
						
						
					 
					
						2021-03-19 10:43:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						e02213262e 
					 
					
						
						
							
							QmlDesigner: Testproject for meta info hints  
						
						 
						
						... 
						
						
						
						Change-Id: I610f6180fb8b26d0bc84cd291781da2f06179b7a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2019-05-20 12:03:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alessandro Portale 
							
						 
					 
					
						
						
							
						
						603191ba77 
					 
					
						
						
							
							Application icons refresh: Qt Creator == "QC"  
						
						 
						
						... 
						
						
						
						This change replaces the existing application icons with the newly
designed ones.
Task-number: QTBUG-70826
Change-Id: I379ac8b5f64c4394c45c95fc4f8d7feb8bdfac69
Reviewed-by: Eike Ziller <eike.ziller@qt.io > 
						
						
					 
					
						2019-02-15 10:28:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						4ebe9458c7 
					 
					
						
						
							
							QmlDesigner: Fix testfile for states  
						
						 
						
						... 
						
						
						
						Change-Id: Ib90334d6f566f0ae5d3a5f4961e23af116d34053
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2018-01-25 17:40:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alessandro Portale 
							
						 
					 
					
						
						
							
						
						6e802988e7 
					 
					
						
						
							
							QmlDesigner: Add manual test for pixel perfect formeditor overlays  
						
						 
						
						... 
						
						
						
						We have a few off-by-ones in the visualization of selection, boundary,
etc. Also, there are differences between low and high DPI, aswell as
different platforms.
This manual test is supposed to enable proper analysis whether the
visualizations are correct or not.
Change-Id: Iee407d37a2c6f2f272e11a4d9774532343463bc1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2017-12-15 09:35:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						b57372f2b5 
					 
					
						
						
							
							Replace include guards with #pragma once  
						
						 
						
						... 
						
						
						
						Change-Id: Ic36cf0e9cac61d4d9a7e4434192944f5301b8aaa
Reviewed-by: André Hartmann <aha_1980@gmx.de >
Reviewed-by: Eike Ziller <eike.ziller@qt.io > 
						
						
					 
					
						2017-06-28 08:07:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						800a932e19 
					 
					
						
						
							
							QmlDesigner: Fix ambiguous ids in plugin testproject  
						
						 
						
						... 
						
						
						
						Change-Id: I05b077f52d643703d0714df99968eb05dfd07dc2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2016-11-24 09:48:22 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						4e947e713b 
					 
					
						
						
							
							QmlDesigner: Add warning about expected error to testfile  
						
						 
						
						... 
						
						
						
						Change-Id: Idb6d26f01e1a4be70fa30ec8175b6b4e509bbaf7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2016-11-23 07:31:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						7fb9108489 
					 
					
						
						
							
							QmlDesigner: Fix ambiguous ids  
						
						 
						
						... 
						
						
						
						Change-Id: I28b0dc2ff0fa919ca99c468c9648ab105c7e38c5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io > 
						
						
					 
					
						2016-11-23 07:31:20 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						e9b4cab807 
					 
					
						
						
							
							QmlDesigner: Adding manual test for cpp mockups  
						
						 
						
						... 
						
						
						
						This is a typical test case for mocking cpp types.
Change-Id: Ibd76429c3d1190c46a223062d77d676f728fec77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io > 
						
						
					 
					
						2016-10-25 13:36:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						3bd9dbf5b2 
					 
					
						
						
							
							QmlDesigner: Adding testproject for directory imports  
						
						 
						
						... 
						
						
						
						Change-Id: Ib9f4feb745722dc1e43c6651ed1cfc4a017818e7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io > 
						
						
					 
					
						2016-07-29 12:04:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						bc921b46a2 
					 
					
						
						
							
							QmlDesigner: Explain frequent mistake in test project  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-15772
Change-Id: I0910d0fce3f93c72febf15b4590c36768146b972
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com > 
						
						
					 
					
						2016-02-24 11:25:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						0642c10512 
					 
					
						
						
							
							QmlDesigner: Adding manual test for dummy data  
						
						 
						
						... 
						
						
						
						This is a small project that tests the dummydata feature.
Change-Id: I710ec6ac8ebf86c85a155a812e581cca88845666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com > 
						
						
					 
					
						2016-02-22 13:39:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						8aaf3a0922 
					 
					
						
						
							
							QmlDesigner: Adding manual test for dummydata context property  
						
						 
						
						... 
						
						
						
						This manual tests shows how to add a simple context
properties for the Qt Quick Designer.
Change-Id: Ied47bc6acbab32d782f6827cf849711aed600821
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com > 
						
						
					 
					
						2016-02-22 10:33:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						954569387c 
					 
					
						
						
							
							Update License according to agreement with Free Qt Foundation  
						
						 
						
						... 
						
						
						
						* Update license information in tests directory
Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2016-01-19 16:01:06 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						7e30a74d41 
					 
					
						
						
							
							QmlDesigner: Remove unsupported testfiles  
						
						 
						
						... 
						
						
						
						Change-Id: I236b26646752783d4956f3c290d1e6463bef5efa
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com > 
						
						
					 
					
						2015-07-09 09:56:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						2e6855249f 
					 
					
						
						
							
							PNG: Run pngcrush on images with iCCP or sRGB profiles  
						
						 
						
						... 
						
						
						
						This quietens warnings from libPNG during startup and shrinks the
image sizes.
Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com > 
						
						
					 
					
						2015-07-03 09:50:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						9926fc2ab1 
					 
					
						
						
							
							Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py
Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6 
						
						
					 
					
						2015-02-12 17:29:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						bc2424c3c6 
					 
					
						
						
							
							QmlDesigner: Adding test cases for layouting  
						
						 
						
						... 
						
						
						
						Change-Id: Id06a24e1c17eea3f7e4d5231e68ade49cdf775f4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com > 
						
						
					 
					
						2015-02-06 08:57:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						3c85058694 
					 
					
						
						
							
							Update License  
						
						 
						
						... 
						
						
						
						Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2015-01-16 12:37:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						b5140d760e 
					 
					
						
						
							
							Update manual tests for ui split  
						
						 
						
						... 
						
						
						
						Changing some files to .ui.qml and extracting call to Qt.fontFamilies()
Change-Id: I6151fd088ba4ff8c2cbd9299bacb534639b0b18c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com > 
						
						
					 
					
						2014-10-16 15:07:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						ea27143239 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/3.2'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h
Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f 
						
						
					 
					
						2014-10-14 15:36:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						5847f325e9 
					 
					
						
						
							
							Manual tests for UI split  
						
						 
						
						... 
						
						
						
						This adds a couple of projects for testing the ui split.
Change-Id: I9056702e724541a43895f28453ce31516a348e70
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2014-10-14 13:26:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alessandro Portale 
							
						 
					 
					
						
						
							
						
						b1176b97dd 
					 
					
						
						
							
							New Qt Creator logo  
						
						 
						
						... 
						
						
						
						Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2014-10-09 15:43:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						8295b503be 
					 
					
						
						
							
							License update  
						
						 
						
						... 
						
						
						
						Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2014-10-09 11:41:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						79c0a29dea 
					 
					
						
						
							
							QmlDesigner: Adding a manual test for plugin integration  
						
						 
						
						... 
						
						
						
						Because we had a couple of regressions in this area, I add this project
for manual testing.
In this project we have a qmlproject with a plugin that contains a .metainfo
file and a custom property sheet.
We define two items in the item library: MyComponent and MyComponent2.
While MyComponent has a custom property sheet the property sheet for
MyComponent2 is auto generated.
Change-Id: I8d5ade43f648354175587c0a3e989bad87149298
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com > 
						
						
					 
					
						2014-09-09 16:54:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						8780a5a5e0 
					 
					
						
						
							
							QmlDesigner: Fix quick1 tests  
						
						 
						
						... 
						
						
						
						The test still used the unsupported Qt 4.7 import.
Task-number: QTCREATORBUG-12567
Change-Id: I47eee256d9e3160aea8e41537fcea92d20b42fd7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com > 
						
						
					 
					
						2014-07-30 14:28:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						746c5d8863 
					 
					
						
						
							
							Incremented year in copyright info  
						
						 
						
						... 
						
						
						
						Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2014-01-08 08:29:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						1fda2111d4 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.6'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104 
						
						
					 
					
						2013-01-31 16:25:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						298531e370 
					 
					
						
						
							
							Incremented year in copyright info  
						
						 
						
						... 
						
						
						
						Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2013-01-29 16:27:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						229105ba89 
					 
					
						
						
							
							QmlDesigner: adding manual test files for Qt Quick 2.0  
						
						 
						
						... 
						
						
						
						Change-Id: I44d3a4165d1ff12488bcc63f19765bc7cf91bc18
Reviewed-by: Robert Loehning <robert.loehning@digia.com > 
						
						
					 
					
						2013-01-15 13:51:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						9fd73a2175 
					 
					
						
						
							
							QmlDesigner: Fixing broken test case  
						
						 
						
						... 
						
						
						
						Since the rect is moved to 648, 480 nothing is visible.
It should be witdth and height instead.
Task-number: QTCREATORBUG-8543
Change-Id: I27721d6df83f5120315bc1f5aff4cc04732e4f60
Reviewed-by: Robert Loehning <robert.loehning@digia.com > 
						
						
					 
					
						2013-01-11 15:33:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						386ca7c8dd 
					 
					
						
						
							
							Adjust license headers  
						
						 
						
						... 
						
						
						
						Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2012-10-05 17:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						e0e8cf3ada 
					 
					
						
						
							
							Contact -> qt-project.org  
						
						 
						
						... 
						
						
						
						Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2012-07-19 13:23:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						2931a499e6 
					 
					
						
						
							
							Long live the king!  
						
						 
						
						... 
						
						
						
						Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com > 
						
						
					 
					
						2012-01-26 19:55:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						31600758de 
					 
					
						
						
							
							all: s/info@qt.nokia.com/qt-info@nokia.com/  
						
						 
						
						... 
						
						
						
						Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2011-11-03 10:33:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Murach 
							
						 
					 
					
						
						
							
						
						a4c4d67772 
					 
					
						
						
							
							corrected license headers  
						
						 
						
						... 
						
						
						
						Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
Reviewed-on: http://codereview.qt.nokia.com/1251  
						
						
					 
					
						2011-07-06 17:56:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						3d417ed605 
					 
					
						
						
							
							QmlDesigner.tests: adding a new testfile  
						
						 
						
						... 
						
						
						
						Change-Id: I1de64b5ddb2262a08e7a50f368a7412b11c1f60d
Reviewed-on: http://codereview.qt.nokia.com/94 
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com > 
						
						
					 
					
						2011-05-24 17:23:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexis Menard 
							
						 
					 
					
						
						
							
						
						64839753f2 
					 
					
						
						
							
							QML WebKit component is now named QtWebKit  
						
						 
						
						... 
						
						
						
						Reviewed-by:Christiaan Janssen 
						
						
					 
					
						2010-06-23 11:37:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						05badc8c30 
					 
					
						
						
							
							QmlDesigner: Fix flipable.qml example file  
						
						 
						
						
						
						
					 
					
						2010-04-15 17:08:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						e7a9619c2f 
					 
					
						
						
							
							QmlDesigner: Bump version number from 4.6 to 4.7 in qml files  
						
						 
						
						... 
						
						
						
						Reviewed-by: Thomas Hartmann 
						
						
					 
					
						2010-04-13 15:15:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						9fcd258c68 
					 
					
						
						
							
							QmlDesigner: Add test case of WebView usage  
						
						 
						
						
						
						
					 
					
						2010-04-12 12:26:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						afdd673771 
					 
					
						
						
							
							QmlDesigner: change manual test  
						
						 
						
						
						
						
					 
					
						2010-03-31 18:49:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						5ed718a002 
					 
					
						
						
							
							Fix imported qml component names under Windows  
						
						 
						
						... 
						
						
						
						Reviewed-by: ckamm 
						
						
					 
					
						2010-03-31 15:50:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						fbb7a343b3 
					 
					
						
						
							
							QmlDesigner: add new file for manual tests  
						
						 
						
						
						
						
					 
					
						2010-03-31 11:05:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						38b5ef374e 
					 
					
						
						
							
							QmlDesigner: Replace *.ico with *.jpg  
						
						 
						
						
						
						
					 
					
						2010-03-26 14:29:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						7daeffbd29 
					 
					
						
						
							
							QmlDesigner: Add new test files for manual testing  
						
						 
						
						
						
						
					 
					
						2010-03-26 12:04:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						7d423d5f96 
					 
					
						
						
							
							QmlDesigner: Fix crash in property editor when parent of an item is invalid  
						
						 
						
						... 
						
						
						
						Happened for
import Qt 4.6
Flipable {
  Rectangle {}
} 
						
						
					 
					
						2010-03-18 16:56:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						bce9521780 
					 
					
						
						
							
							QmlDesigner: Add files for testing image formats  
						
						 
						
						
						
						
					 
					
						2010-03-15 09:36:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						31f7c87537 
					 
					
						
						
							
							QmlDesigner: Fix StatesView for switching subcomponents  
						
						 
						
						... 
						
						
						
						Reviewed-by: Thomas Hartmann 
						
						
					 
					
						2010-03-09 12:23:21 +01:00