feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
46,723 Commits 108 Branches 368 Tags
ff9a49f99f652f0217a118e32447d45c9d89e30a
Commit Graph

82 Commits

Author SHA1 Message Date
Thomas Hartmann
953ec9867f QmlDesigner: Improve performance of item library 
If there are manu components (e.g. 200) in the same directory,
the model was updated for each component.

This patch compresses the signal and therefore reduced the updates.

Change-Id: I80b38df59952dda7e67e258ecd6e5f29d6a036e6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-06-27 10:20:04 +00:00
Tim Jenssen
3a3029e671 QmlDesigner: updateSearch is also called inside updateModel 
Change-Id: I1c36794f5b2d336a6194dc3ee65ad0651bf0aa95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-08 09:21:57 +00:00
Tim Jenssen
792b9fe6c9 QmlDesigner: remove unused code (meego, ...) 
Change-Id: I25c1bc568b2d83cc8f166a041dc56c022d5f638a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-08 09:21:43 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Alessandro Portale
b242c100cb Qt Quick Designer: Enable HighDPI items in ItemLibrary 
Item library icons and the drag pixmap could be avalible as
@2x variants.

Change-Id: Ice2254e769351fe4b715f911b3c14aa61813636c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-12-14 14:58:05 +00:00
Alessandro Portale
00e081358d Qt Quick Designer: remove some dead code 
Change-Id: I8070d1a929de2c176e0954c57dedcdd415bfe22d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-09-30 10:33:34 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3 
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-09-18 12:12:57 +00:00
Thomas Hartmann
893dfade18 QmlDesigner: QT_NO_CAST_FROM_ASCII fixes 
Change-Id: I45cd69bb863dbf7fc51f6d64fa4b2509c0e2ecee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-17 12:56:31 +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
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Christian Kandeler
6595c0a9d1 Catch exceptions by const reference. 
Change-Id: Ic537fd123478a4f8fe4e54736d444fa64fd62d9c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-28 12:01:41 +01: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
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Tim Jenssen
14022854d4 QmlDesigner: Use QQuickWidget again 
This is the revert of the reverts ;)

Change-Id: I750dfffa6d509e058b97b605be5f2cc0a42c28f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-26 16:48:38 +02:00
Marco Bubke
2932e68fd4 Revert "QmlDesigner: Use QQuickWidget in the item library" 
This reverts commit 8dfb05c846.

Because we get crashes with QQuickWidget.

Change-Id: I7a60c139df3cccb9498d0750e4f40c60faf31509
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-07 16:11:03 +02:00
Tim Jenssen
ce96202857 QmlDesigner: hotfix for Qt 5.3.2 to ungrab the mouse 
At the moment the QML world does not get the release event if
a drag started in QML and ends up on QWidget world.

Hotfix: 3.2
Task-number: QTCREATORBUG-12510
Change-Id: I4f4c023e177221af61ba9e754f27a5087013fb08
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-30 15:27:16 +02:00
Tim Jenssen
b013637f22 QmlDesigner: remove delayed drag and drop call 
Change-Id: I6d2c1c2f25ba88f3c6f0af9b52968a9bd005cd85
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-30 14:54:08 +02:00
Marco Bubke
8dfb05c846 QmlDesigner: Use QQuickWidget in the item library 
Change-Id: I8297b513722fb5fc51fedadfd5f93e3198800ada
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-23 22:23:25 +02:00
Tim Jenssen
2e06f98a3b QmlDesigner: convert itemIds to real entries 
Change-Id: I421d20a33f8f30fe796f72e4500a2756b97c7983
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-19 18:07:41 +02:00
Marco Bubke
e51047992a QmkDesigner: Refactor ItemLibraryItem 
Change-Id: I0876f3b94df6ea0cf457e67306c89a798f0c8bfd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-19 15:43:37 +02:00
Tim Jenssen
115620aabc QmlDesigner: cleanup unused methods 
- remove javascript methods: scrollView(delta), resetView()
 - remove javascript related signals
 - remove visibleCount debug output

Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-18 16:53:51 +02:00
Marco Bubke
a5fb3ad669 QmlDesigner: Use library entry icon for DnD in item library 
Change-Id: Ie8a55c352eddcfec3591e2174373bed524a81dac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-12 15:28:20 +02:00
Marco Bubke
5523bea6fb QmlDesigner: Fix icon names for ItemLibraryEntry 
icon and iconPath are two different icons.

Change-Id: I62ab07a13240bc23bc9d807dbd46742ce7d71300
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-12 15:28:11 +02:00
Tim Jenssen
de847bf891 QmlDesigner: remove debug enum 
Change-Id: Icbb1ac041387b1dda136957c4689b79a5615ed89
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-11 16:03:00 +02:00
Tim Jenssen
8dd5e4e590 QmlDesigner: use a central notTooBrightHighlightColor() 
Change-Id: I71988cda0f9488a59722b00e0c0c0e926a15e7f2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-11 16:02:55 +02:00
Tim Jenssen
ef87889b63 QmlDesigner: add reload feature to item library view 
Change-Id: Ib71dc235abd059056063c5d9b9072c8bdc932762
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-11 14:13:22 +02:00
Marco Bubke
ed1908c00c QmlDesigner: Refactor ItemLibraryModel 
Change-Id: Ic3768bbd3ed3f65b456b0e9e2b4c8ab9497ca1ce
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-03 17:46:12 +02:00
Marco Bubke
e3ae459ef1 QmlDesigner: Remove Internal namespace in the ItemLibrary 
Change-Id: I183e57c7e5dcfaca903346972f5e4983e1beaa14
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-03 17:44:54 +02:00
Orgad Shaneh
caf296500d QmlDesigner: Fix order of initialization 
m_resIconSize is passed to m_iconProvider's ctor, so it should
be initialized first.

Change-Id: I7a5dfb648cce029869b1e8a36eee761a5bd46faf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-22 14:16:40 +02:00
Marco Bubke
5eb28a5f82 QmlDesigner: Remove custom drag and drop code 
Change-Id: I97d94003aef76d014486ff29d0e8f78689f7558f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-14 11:36:21 +02:00
Marco Bubke
4743217eac QmlDesigner: Exchange QLatin1String with QStringLiteral 
Change-Id: Iaefe0ea33ee17795cb402da33e4e7f0da747d4d5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-13 15:05:38 +02:00
Jarek Kobus
96a3fd53e8 Fix tooltips, add lacking dots 
Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-13 12:06:27 +01:00
hjk
a74de6af81 Utils: Merge FilterLineEdit into FancyLineEdit 
Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-14 16:58:43 +01: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
Thomas Hartmann
1178a048fc QmlDesigner.ItemLibrary: Start drag using QTimer::singleShot() 
A drag might change the imports which invalidates the model exposed
to qml. Since QObjects are deleted when the model is reseted this did lead to
a crash in the qml engine, because the object emitting the signal was deleted.
To avoid this we call startDragAndDrop() asynchronously using QTimer::singleShot().
Now the object is always deleted after the signal is emitted not during the emit.

Task-number: QTCREATORBUG-11139

Change-Id: I92e7f9dfff33697b9ff0da148dc9da629723ab7e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-01-06 15:47:15 +01:00
Orgad Shaneh
38dbb6ab11 Fix compiler warning 
Change-Id: Ib77456e9d0143eeddecc2c2027eecaabddea0a66
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-21 14:12:57 +01:00
Thomas Hartmann
e4dd8e75d1 QmlDesigner.ItemLibrary: Fix Drag Drop on Mac OS X 
Since grabMouse() is limited on Mac OS X, we cannot use
the custom drag and drop code anymore.
The icon stays visible.

Task-number: QTBUG-34201
Task-number: QTCREATORBUG-10414
Change-Id: I92009c34881d086049e50b0c9ef109a7149ac657
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-20 10:28:59 +01:00
Thomas Hartmann
639a04ac09 QmlDesigner.ItemLibrary: to not scale null pixmaps 
Change-Id: I23c22f3b0f383158814e105058e827e8703fb336
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-31 14:25:46 +01:00
Thomas Hartmann
67402b35bf QmlDesigner.ItemLibrary: do not show warnings by default 
Change-Id: I7e470359f290346fcab3453c7b17f44866db7679
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-31 14:24:59 +01:00
Thomas Hartmann
dce623b1bf QmlDesigner: Porting to Qt Quick 2 
This patch ports our Qt Quick views to Qt Quick 2.

Change-Id: Ie0cfd81e7ebb76d2ed667211ad063feaaff5aa14
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-16 13:36:58 +02:00
Marco Bubke
aa4e4e382b QmlDesigner: Hide the filter widget for import in the ItemLibraryWidget 
Change-Id: I3a7120793d3a6a34b45a22dbb25cf6a5381580e8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:50:56 +02:00
Marco Bubke
04d7ece089 QmlDesigner: Cleanup the ItemLibraryWidget 
Change-Id: I4686ed5e5c218e1e37a189bdfc19cdb4ea4640f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:50:50 +02:00
Marco Bubke
cf3e8163fb QmlDesigner: Move ImportManagerView to ItemLibrary 
Change-Id: I546199945e4b0b0acc7e4b656da547868b1cc99d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:50:42 +02:00
Nikolai Kosjar
deb4fbe768 Compile fix in QmlDesigner 
itemlibrarywidget.cpp:53:42: fatal error:
private/qdeclarativeengine_p.h: No such file or directory

Change-Id: I55109fdecd33203199f73017ae06da88c892ff4d
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-13 09:09:50 +02:00
Thomas Hartmann
fd4e68ac7e QmlDesigner.ItemLibrary: remove declarative private dependecy 
We derived from QDeclarativeListModel which is private.
This patch uses QAbstractListModel instead.

Change-Id: Ib567433f5fbb38780b32e5a9291d2cb87730e624
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-12 18:21:27 +02:00
Leena Miettinen
dd4bd99c89 Doc: replace "element" with "QML type" or "item" 
Try to make terminology more consistent, by using
"QML type" when describing the types, "item" when
describing instances of QML types, and "component"
when describing objects built by using QML types.

Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-13 14:32:47 +01:00
Thomas Hartmann
ee4bf638ca QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:34:39 +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
Orgad Shaneh
025ff8f922 QmlDesigner: Translate some strings 
Change-Id: Id2c045cf0947ce38698f82f43536f25252aa4160
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-12-06 11:11:30 +01:00