Commit Graph

4987 Commits

Author SHA1 Message Date
Tobias Hunger
d2eb042676 JsonWizard: Remove empty lines
Task-number: QTCREATORBUG-13289
Change-Id: I2c8d1fc4e2cfcb940e76a6988d35e80703548668
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 15:38:47 +01:00
Tobias Hunger
86d7a980ff JsonWizard: Replace EmptyProjectWizard with a JsonWizard
Change-Id: Ia199a04b535535722a3b47a9651b16635b019cbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:24 +01:00
Tobias Hunger
cda0320f5b JsonWizard: Match up files generated by the Cpp Class wizard
Change-Id: I407958b02446e81a449a34519a9eb592723a08a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:08 +01:00
Orgad Shaneh
4336f8874e Dumper: Adapt Token dumper 3.2
Change-Id: If7d6ba7265620edb14d258884b26578c36da2651
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-31 11:13:26 +01:00
Tim Jenssen
67fef99766 QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere

Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:47:05 +01:00
Thomas Hartmann
e8a937d82a Fixing the latest .qrc Qt Quick Application wizards
* The .ui.qml files were not properly generated.
* The .qrc file was wrong
* We have to use Window and set visible to true

Change-Id: I4617aba04048bebf744cf164013bd5af0aaadcd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-30 16:14:49 +01:00
Thomas Hartmann
d525d28e6f QmlPuppet: Enabling style support
If a style is activated by setting QT_QUICK_CONTROLS_STYLE we have
to use QGuiApplication instead of QApplication.

Change-Id: I138a4fb75508f989f97b207a7024a426fa379f9e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-30 14:39:01 +01:00
Thomas Hartmann
7a470e9730 Updating the .qrc based wizards to use .ui.qml files
Change-Id: I178b9cdbb895ef221d74b9aa282163307550fd13
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-30 14:16:17 +01:00
Tobias Hunger
b159d740fa JsonWizard: Replace Python class wizard with a JsonWizard
* Remove Qt4 support.
* Remove some UI options that did not do anything in the original wizard

Change-Id: I9647cbc6cd0958a02df5b2fe480b9c8069249521
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 13:38:33 +02:00
Orgad Shaneh
6b4c254bf3 Theming: Fix light colored find widgets style
It is used when e.g. searching the environment widget.

Change-Id: I203b9f5e280a8f18f7a38f8e4d7b4540c79f932c
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-23 13:57:37 +02:00
David Schulz
7c795b6667 Fix project file in the script wizard example.
Do not add the header file to the sources group of the project.

Change-Id: I2850854e0ded1fa226c7ef5f4428d0de7ec20c75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-23 09:29:39 +02:00
Orgad Shaneh
92a1f66cdf GenericHighlighter: Update from latest KTextEditor source
Change-Id: If31df61e1e4aa7133d6384e91a362405149c2883
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-22 14:05:44 +02:00
Tim Jenssen
49c39eb029 QmlDesigner: create DesignerSupport on stack
- it has the same life cycle like the Qt5NodeInstanceServer
 - we don't need to create and delete it (with maybe memory leaks)
 - this fixes a crash while the puppet is closed after an item deletion

Change-Id: Iecd6515eb41324b95e99e151d77ee74895230182
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-22 11:29:30 +02:00
hjk
6aa84464f6 Debugger: Be more verbose in dumper debug output
One of the should-not-happen situations seem to happen.
Add extra output to help to track it down.

Change-Id: I40bad85ce2fbaf1f02043b3d97f657461f5a1995
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-21 09:38:55 +02:00
Tobias Hunger
9bcecbe8fb Rename qml file templates
... to not trigger warnings about invalid syntax.

Change-Id: I21d94b521650a32e86d1181c412ff1e99a6e24b2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-20 11:11:23 +02:00
Alessandro Portale
ca9ed45016 Theming: Remove IconOverlay section from default.creatortheme
IconOverlays are now defined in the Images section. Also,
default.creatortheme does not need to define these since they are
already defined in the cpp code as fallback.

See a18b067326

Change-Id: Id2cf616068b11c5aa8e43ee695369063e6a4ee0e
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-20 09:09:30 +02:00
Alessandro Portale
5d84104d63 Theming: WelcomeScreen fixes
Restores the separation line in the WelcomeScreen
Some colors were still referenced with the incorrect name.

Change-Id: Ia0de1b4779ecc67030ebb4a5877edd5a6f24085c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:28:09 +02:00
Alessandro Portale
34ba0c273a Theming: Use QQmlPropertyHash for passing theme to QML
This makes the mapping of theme values to QML automatic.

Change-Id: I4442ef454dc3a7dde1bd6b068b03ff890db3e49f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:13:28 +02:00
Alessandro Portale
1c451c7a8a Theming: Small font color fix in default theme
Inactive doubleTabWidget tabs had a white color. This patch restores
that.

Change-Id: I775de6b4a647cc9a6f064e8658b7a675d5b605fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-17 16:31:30 +02:00
Thomas Hartmann
6d660f3051 Make QtQuick QML wizards more consistent
With this patch there is a Qt Quick 2.4 and a Qt Quick Controls 1.3 wizard
that both use .ui.qml files, but only the wizard for controls actually
uses controls. Using .ui.qml files is now the default for the latest versions.

Change-Id: I0d6c4d6878c0052330387339562831af37aa482b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-17 12:49:15 +02:00
Thomas Hartmann
73158461b6 Add file wizard for .ui.qml forms
This wizard creates a .qml file that uses the pure form
.ui.qml file.

Change-Id: I1076ae4876002b2b726404c309d399c5268979ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-17 09:34:43 +02:00
Alessandro Portale
a18b067326 Cleanup of Theming
A theme is supposed to provide colors, flags and images. This change
removes functions from Theme which do not just return simple data.
Also ManhattanStyle and Theme get separated a bit.

Change-Id: I2fab26ee38b858fefb55920eb219f84abcfaac18
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 12:35:29 +02:00
Tobias Hunger
4612cccb08 JsonWizard: Replace FormWizard with JsonWizard
Change-Id: Id469ee792e148d83b33002ee8295d15b5175ebbd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 12:06:26 +02:00
Alessandro Portale
91c011d795 WelcomeScreen: Fix hover effect for default.creatortheme
Change-Id: I8a1761ae0dde2a05b81dcbaacdf0b6844277f762
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 11:33:01 +02:00
Tobias Hunger
52e31f80ad JsonWizard: Enable validators for lineedits on Fields pages
Make use of a validator when entering C++ class names.

Change-Id: Id7f9c8c2e1fe036397a337595cbe7aa7fd9589d5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-15 18:21:55 +02:00
Tobias Hunger
50df8aa984 JsonWizard: Replace CppClassWizard with a JsonWizard
Change-Id: I4e1aeea4ccd1087b5e804e9ba4c2aa8fde4f4fcb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-15 18:21:49 +02:00
Thorben Kroeger
84f5585b5d Implement theming for QtCreator
Adds a 'Theme' tab to the environment settings and a '-theme' command
line option.
A theme is a combination of colors, gradients, flags and style
information.

There are two themes:
- 'default': preserves the current default look
- 'dark': uses a more flat for many widgets, dark color theme
  for everything

This does not use a stylesheet (too limited), but rather sets
the palette via C++ and modifies drawing behavior.
Overall, the look is more flat (removed some gradients and bevels).

Tested on Ubuntu 14.04 using Qt 5.4 and running on a KDE
Desktop (Oxygen base style).

For a screenshot, see
https://gist.github.com/thorbenk/5ab06bea726de0aa7473

Changes:
- Introduce class Theme, defining the interface how to access theme
  specific settings. The class reads a .creatortheme file (INI file, via
  QSettings)

  - Define named colors in the [Palette] section
    (see dark.creatortheme for example usage)

  - Use either named colors of AARRGGBB (hex) in the [Colors]
    section

  - A file ending with .creatortheme may be supplied
    to the '-theme' command line option

- A global Theme instance can be accessed via creatorTheme()

- Query colors, gradients, icons and flags from the theme
  were possible (TODO: use this in more places...)

- There are very many color roles. It seems better to me
  to describe the role clearly, and then to consolidate later
  in the actual theme by assigning the same color.
  For example, one can set the text color of the output pane button
  individualy.

- Many elements are also drawn differently.
  For the dark theme, I wanted to have a flatter look.
  - Introduce Theme::WidgetStyle enum, for now {Original, Flat}.
  - The theme specifies which kind of widget style it wants.
  - The drawing code queries the theme's style flag and
    switches between the original, gradient based look and
    the new, flat look.

- Create some custom icons which look better on dark background
  (wip, currently folder/file icons)

- Let ManhattanStyle draw some elements for non-panelwidgets, too
  (open/close arrows in QTreeView, custom folder/file icons)

- For the welcomescreen, pass the WelcomeTheme class.
  WelcomeTheme exposes theme colors as Q_PROPERTY accessible from
  .qml

- Themes can be modified via the 'Themes' tab in the environment
  settings.

TODO:
* Unify image handling
* Avoid style name references
* Fix gradients

Change-Id: I92c2050ab0fb327649ea1eff4adec973d2073944
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 17:21:10 +02:00
Alessandro Portale
bde3629b29 WelcomeScreen: Session layout improvements
No gaps. Smoother hovering. Some cleanup.

Change-Id: Id4110ab10973a7df8b5c39a90d60878145ad389b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-15 16:11:49 +02:00
Tim Jenssen
6a74c9d4a7 QmlDesigner: fix Section Collapsed size bug
Change-Id: Iff7016b35aeb763569366400460c12b99689e14f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-15 16:11:06 +02:00
Tobias Hunger
cd0ff57e2f JsonWizard: Replace JsFileWizard with a JsonWizard
Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-14 21:38:50 +02:00
hjk
65ebdc7e03 Debugger: Fix recent typo in putSimpleCharArray
The joys of scripting languages without compile time checks.

Change-Id: Ic9405d549f3e60d5b834350fa3bce1d4d4609747
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 21:09:50 +02:00
Orgad Shaneh
1ff1b8dbfd Debugger: Remove unused values from DebuggerStartMode
Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 18:19:38 +02:00
Thomas Hartmann
d7105cc245 Wizard for ui.qml file based project.
Change-Id: Id0f61efce0ae47c28eb2f5fbcee5468dc5c339ca
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-14 17:18:48 +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
Alessandro Portale
65aef999ce WelcomeScreen: Fix font differences in "Projects" tab
Task-number: QTCREATORBUG-13165
Change-Id: I6ee42792e374d2a80c24871421bcf99ebecab719
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 14:09:50 +02:00
Alessandro Portale
087d1f5cd5 Update URL to the Qt Account page
It moved to https://account.qt.io

Change-Id: I54df8eb37d06d2ab5f4d6c3bb489fbdd7d3e5229
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-14 12:23:28 +02:00
hjk
27d3d5140f Debugger: Add QVarLengthArray dumper
Change-Id: I817ccd432a81ea0bf7432e6660a049fd41c926ec
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-13 21:36:50 +02:00
Thomas Hartmann
c20c20f012 QmlDesigner: Activate anchor target selection
Change-Id: I5aada9ffa67177b13ec7cf7f3c819f2f0530a822
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-13 18:43:00 +02:00
Alessandro Portale
ee9ba6a32e WelcomeScreen: Adding @2x variants for the icons
Change-Id: I50ecb0ff07c84033eaede6fd8a5dbcdc2ae5230d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-13 17:05:51 +02:00
Alessandro Portale
9d58d44941 WelcomeScreen: Improve hovering of recent project items
No gaps inbetween the items. The whole area is click-sensitive.

Change-Id: I269e657ef8940387d9844baf17741c1cb3a50dd9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-13 10:49:48 +02:00
hjk
392b3f65d2 Debugger: Speed up reading of 0 terminated blobs in dumpers
Change-Id: Iebc64c21f4dd6f4876989e57d3a347b96e1bd449
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-13 09:22:23 +02:00
Thomas Hartmann
47e3c79b88 QmlDesigner: Updating WindowSpecifics
Change-Id: Ic4bead3e100d00cf532fa10cda42270eb642bb26
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-10 17:00:37 +02:00
Thomas Hartmann
0812718905 Adding new wizards for QtQuick supporting Qt 5.4.
Change-Id: I2af1cff65032bb583864c1c8ee3a3636a46e3c39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-10 16:09:03 +02:00
Sergey Belyashov
f9d5bfe996 Update Russian translation
Change-Id: If1782c8501353cb953a17f8be43abec987b67e94
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-10-10 15:10:06 +02:00
hjk
1baca8e797 Debugger: Add dumper for Qt3's (sic!) QString
Change-Id: I24d266587425a5c50ec3dcb548a29877730cbdff
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-10 13:25:02 +02:00
hjk
0691bf93b0 Debugger: Remove unused dumper code
Change-Id: Idc2d17e34bf5666c56d6f54b657867f1b0ecf943
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-10 11:37:28 +02:00
Tim Jenssen
605e869335 QmlDesigner: fix regression from last filter import fix
- adding line ending to the import code
 - set correct fileUrl to resolve local directory imports

Task-number: QTCREATORBUG-12625
Change-Id: I2861fc5674ff0fa4f6cc9e308a22cd2853ffa85c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-10 11:16:12 +02:00
Tim Jenssen
ab21b7b67a QmlDesigner: move setObjectOwnership
- to the same position like in the other methods

Change-Id: Ie12147de0e9030a35928a2c0a5dd38d34f998845
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:10:49 +02:00
Tim Jenssen
fd6afba3c3 QmlDesigner: improve error output of the puppets
- errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-09 18:10:43 +02:00
Tim Jenssen
808094e9e1 QmlDesigner: avoid setContext warning if there is already one
Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:09:37 +02:00