Commit Graph

41 Commits

Author SHA1 Message Date
Tim Jenssen
453f4996db use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.

This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.

Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-13 15:38:46 +00:00
Christian Kandeler
0378f51719 qbs build: Install package-manager data
Amends cc0fa86ffd.

Change-Id: I56bb490f2e7b971f7d25255a4ee824b39c4d1ba9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-31 11:11:46 +00:00
Christian Stenger
5299e58cea Shared: Do not copy or install binary artifacts
Change-Id: Ie3b12b790b014f28df31385969a5695bfa73b3a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-04 12:52:58 +00:00
Christian Stenger
6a23f644dc Android: Fix qbs build
Amends f46099d21e.

Change-Id: Idf5405a6cd571eedb0932dbba2c981f63ab59ae3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-12 07:54:59 +00:00
Alessandro Portale
904ad4763f SharedContent: Update share.qbs
Change-Id: I07a3c5db37459c5bf1b6219a5d58f88e6346ca43
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 08:28:26 +00:00
Christian Kandeler
bc15b47487 Build Qbs QML type info dynamically
... when building with qbs. Optionally also update the copies in the
repository.

Change-Id: I4604eff6de95101a8cb086708d5a9ef24af0fd32
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-02 09:14:01 +00:00
Eike Ziller
ba0faf229a Remove external tool for "sort text"
We now have Edit > Advanced > Sort selected lines

Change-Id: I948718a1be432e00b2646b29f173894a51691164
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-11-03 07:30:52 +00:00
Christian Kandeler
b1477190de Fix qbs build on macOS
"osx" -> "macos"

Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-07-28 14:45:12 +00:00
Christian Kandeler
a0f956f050 qbs build: Introduce new module "qtc".
The qtc module gathers properties that used to live in the top-level
project file. This is the first step towards making it possible to build
plugins against an installed Qt Creator ("out of source build").

Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-08 08:46:00 +00:00
Eike Ziller
c320d3909a Move 3rdparty resources into 3rdparty subdirectory
Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-12 12:30:55 +00:00
Jochen Becher
d92142f149 Add new ModelEditor plugin.
The plugin is based on the 'modelinglib' library. For features and
screenshots see https://wiki.qt.io/ModelEditor

Change-Id: I857be0652a852cc69a9729f64e67134fe630af00
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 12:13:36 +00:00
Christian Kandeler
463566afbe CplusPlus: Install run-time resources also with qbs build.
Change-Id: I65741f6a74a73925df78b7f35f21f98be35f8270
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-24 14:51:52 +00:00
Christian Kandeler
d2522905e0 qbs build: Don't treat templates directories as artifacts.
This dubious workaround is no longer necessary due to the new
qbs.installSourceBase property.

Change-Id: I352b82ddf445ea6e7d8f870769de805bf71e7dc4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-05 10:21:39 +00: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
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Christian Kandeler
d738a02482 Fix qbs build.
Change-Id: I0dc479bac4c9a0ebc449bf0fe89a54f1470060fb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-27 10:31:22 +02:00
Christian Kandeler
d0633f0ac9 qbs project files: Add project property ide_source_tree.
The qmake project has this as well. Will become more useful later on.

Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:01:39 +02:00
Orgad Shaneh
b0283de055 Add qmlscene to qbs build
Change-Id: I77ac542c5c826d84d74321dfe5e3e87afb4221cf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-26 16:20:27 +02:00
Christian Kandeler
4677389a13 qbs build: A number of missing adaptations to qbs changes.
Change-Id: I37452bad6a51bb8d40a13232d46c575a483c5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-12 14:01:14 +02:00
Eike Ziller
1b3bb5cb7e Consistently give qbs groups a name.
These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 13:40:51 +02:00
Eike Ziller
e3fd25256d Qbs build files: Install files to correct location
First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-22 16:58:09 +02:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
Eike Ziller
ba1d5f2cdf Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Kai Koehne
62b20005dd Split up QML Extension wizard in Qt Quick 1 and Qt Quick 2 one
Task-number: QTCREATORBUG-8269
Change-Id: I6b4a4d54499302354606f9446f68b9088daad1e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-26 14:15:12 +01:00
Orgad Shaneh
1011a486f4 qbs files: Remove src/share/share.qbs
Merged into share/share.qbs

Change-Id: Ia60124a851d234c69e5bc1a57a9e390863327f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-12 11:01:31 +01:00
Orgad Shaneh
3e92cd8a7d Update share.qbs
Change-Id: I14972581bdc449719104cb981af7cce6b7c5a1aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-22 17:55:25 +02:00
Friedemann Kleint
2f3730ca47 Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.
QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-18 11:47:47 +02:00
Orgad Shaneh
b515768dde Use file pattern in share.qbs
Change-Id: Iea20297d4281f7c6c149efedcc855c06641f8875
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-16 12:10:12 +02:00
Orgad Shaneh
8ec446efdc Remove temp file from share.qbs
Change-Id: Iaf39b5240bf2878051c0442c15ff1b82bcb55bfd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-09 08:29:37 +02:00
Joerg Bornemann
cc0c2f69eb share.qbs updated
Change-Id: Ia2e439a068dff75ebfa18c36f749967200961fd5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 14:33:17 +02:00
Nikolai Kosjar
3e773824bd Fix qbs build.
Change-Id: I18669823c5bd06e288e24afd4925a38ca8480095
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 13:29:55 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
Orgad Shaneh
f495738103 Update share.qbs to match qmake build
The only thing that is left is excluded translation support

Change-Id: Ib419fee5caf10742e94cdf3b6bc7eee937637ea3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 09:07:44 +02:00
Orgad Shaneh
a3251e2979 Update share.qbs
Also update the script to exclude translations.{pro,qbs}

Change-Id: I0d91218ad83b14a6ed319aac9b8770ebb2db7be8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-26 19:36:40 +02:00
Christian Kandeler
0b28569ec6 Fix qbs build.
Was broken by f1962c9bd5.

Change-Id: I27ba26497b787829c444f3b7760f7b1fd1d198f8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-21 10:54:05 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Joerg Bornemann
7901aef282 share.qbs updated
Task-number: QTCREATORBUG-7514

Change-Id: I237c6550698b4f70c7f8b4844109ab45e0918e56
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-06-05 16:20:53 +02:00
Joerg Bornemann
82cd6919ad share.qbs: do not install content of share/qtcreator/patches
Change-Id: I15c0d29e63015a346381389098a9a00f970cbc3c
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-17 16:20:34 +02:00
Joerg Bornemann
26d0311b70 qbs files: share.qbs updated
Now the Welcome screen is visible again.

Change-Id: I41aeae823c6f81dfec93111f9b4a957f812cb496
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-02 13:46:46 +02:00
Orgad Shaneh
81e4216cd6 Fix qbs build.
Cherry-picked from 36effe8cb4

Change-Id: Ica43f7e10cbee5556f32f73bc2091b138e8847e8
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-12 17:13:46 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00