Commit Graph

37090 Commits

Author SHA1 Message Date
Daniel Teske
fb1f1c2c46 Bump version numbers
Change-Id: I6f3fdea94d4f1e25513d976fd8ef18c395d8fa7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-05 17:02:49 +02:00
Tim Jenssen
e917559319 QmlDesigner: prioritize puppet processes a bit
Change-Id: I97d846cb46851f8f3067d839aeb0b856298ed0c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:59:27 +02:00
Thomas Hartmann
b24b27f4f9 QmlDesigner.PropertyEditor: Fixing coding style
Change-Id: Ifc0e17d5d34d6c69b201d8fc03d444a89e146ac0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-05 16:52:16 +02:00
Thomas Hartmann
eab3a5eb97 QmlDesigner.PropertyEditor: Fix relative anchor targets
If the target is the parent we want to anchor to the same edge by default.
If the target is a sibling we want to anchor to the opposite edge by default.

If the anchor target is changed we have to evaluate this.

Change-Id: I80ee52da7537435956880bcc132c2bc34ddfc0ed
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-05 16:52:09 +02:00
Tim Jenssen
114d3843fc QmlDesigner: write crashed if it crashed
Change-Id: I3c31e12aa58f7d3752920bd017304f77498a2b04
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:31:01 +02:00
Tim Jenssen
b7dbbc6ef0 QmlDesigner: fix crash on mac
Came from two deletions at the same time QCache::remove and
delete on sharedMemory.QmlDesigner:

Change-Id: I6a29cf160c8e81ecd955cf36999edc639fbbb63f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:30:47 +02:00
Tim Jenssen
bbc9005afa QmlDesigner: make environment variables more consistently
Change-Id: Id384ea6e5a3b79952910889c838938c984c2bce8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:30:07 +02:00
Thomas Hartmann
f46f36800e QmlDesigner: Compile fix
Change-Id: Ia3bd03e683ab9a9243d40f07a4b1b4b80026ae20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 15:34:01 +02:00
BogDan Vatra
dedb9172e0 Android: On Qt 5.4 AndroidManifest.xml is moved to templates folder
If we don't find it in the java folder we return the templates folder.

Change-Id: I8a9c478ed3f9e32e9ed8c656545ab90c18204e52
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-05 14:51:34 +02:00
Thomas Hartmann
048ff52b4c QmlDesigner.FormEditor: Lighten the indicator for Tabs
The blur was too much.

Change-Id: If020f83858fe34744277d94d3d4b2aca4af83a74
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:51:24 +02:00
Tim Jenssen
d315a71c30 QmlDesigner: cleanup code
Change-Id: Ibebef6313113ff0097586373795e6117b7112876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:08 +02:00
Tim Jenssen
0370fa214a QmlDesigner: Use Q_GLOBAL_STATIC_WITH_ARGS for the global hash
To be sure that the shared memories are removed at process exit.
And fix that createSharedMemory reuse possible already existing shared
memories now. ("take" -> "[]")

Change-Id: Idcc99ba42b862b862d5403ecf3b781a27fdf757f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:02 +02:00
Thomas Hartmann
b2ac3fd90c QmlDesigner.PuppetCreator: Set qmlpuppet dir as working dir
Before the working directory was the working directory of Qt Creator.
If the working direcotry was the bin diredtory of Qt Creator the puppet
picked up the qt.conf from Qt Creator and could not load the platform
plugin.
Change-Id: Iab22267c578fc837b1b52bded850f0033618811c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-05 14:00:25 +02:00
Tim Jenssen
31df04c5ae QmlDesigner: fix a crash when moving to subcomponent
Change-Id: Ib8fd13a3688447dcb7eeaca811f3abfefa4b5089
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 11:14:40 +02:00
Orgad Shaneh
b525addb10 ProjectExplorer: Fix compilation with GCC
Change-Id: I981df3a89dcd7aacd19f7c5eb8c15b027bdd16e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-05 05:35:14 +02:00
Thomas Hartmann
0b74df58a5 QmlDesigner.DocumentManager: Fix goIntoComponent for Loader
We have have to check and handle sourceComponent and component (Tab).

Change-Id: I736648fc09fe4ee3333c4524666e3acea500804a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 18:48:08 +02:00
Thomas Hartmann
316bfcaee1 QmlDesigner.Model: Fix isComponent for Loader
Loader was also interpreted as a component, but the handling
of component and sourceComponent was incorrect.

Change-Id: I5cd691ece1a29c77b52dc74785013f08d589b2eb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 18:48:03 +02:00
Thomas Hartmann
798af5d70e QmlDesigner.AddingTabs: Anchor the root item of the tab content
Change-Id: Ia59098be3ca25753f03f31f964c6fb824bae677a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 17:21:53 +02:00
Joerg Bornemann
f4a56fce40 WinRt: remove unused using directive
Change-Id: Ie8857eb180109fff3fb8e1eb14a493b38f2133a7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-04 16:39:54 +02:00
Thomas Hartmann
a21a55b59b QmlDesigner.ShortcutManager: Fix CLANG static analysis warnings
Change-Id: I9600439e1236c52b347c667bac6b6d79e2335375
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:52:05 +02:00
Thomas Hartmann
a158ed44ba QmlDesigner.PropertyEditor: Add Q_DISABLE_COPY to PropertyEditorQmlBackend
Change-Id: Ib9af721d195291886a78fc300e24691827f56ade
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:51:59 +02:00
Marco Bubke
80a39815f0 QmlDesigner: Limit native key to 31 letter
OS X is only supporting a maximum of 31 letters for shared memory names.

Change-Id: I61351228decaa3fa7ec19a6035620ab932cf5386
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:38:13 +02:00
Orgad Shaneh
ed02e7f3c5 Git: Fix crash when returning to commit editor from diff
The crash happens on Linux/Xming. 2 subsequents calls to
slotRefreshCommitData occur, m_commitDataFetcher is released when the
first one is handled, and the second call dereferences NULL.

Change-Id: Ibc06fe5dd89b790ac84544f6842cbf345d118703
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 15:27:00 +02:00
Orgad Shaneh
4dd200259f ProjectExplorer: Improve detection of MIPS variants
Detect also "mips" and "mips64" as mips

Change-Id: Ia2259bc4c1144834d20f6bd1c7c91f359e1a67d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 15:26:52 +02:00
Orgad Shaneh
516b5793d9 ProjectExplorer: Cleanup triplet tests
* Avoid duplication
* Avoid unnecessary casting

Change-Id: Idb1426e4a128044091fb52450b5662ff54012f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 15:26:21 +02:00
Joerg Bornemann
d4a32cdba9 WinRt: fix run control for SUBDIRS projects
Winrtrunner was called with the executable file path for the
top-level .pro file, which happens to be the empty string.
We now store (and use) the right .pro file path.

Change-Id: I7d71e6b99393e863f3ba0df2d2902f29d75a9583
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-04 12:39:19 +02:00
jkobus
d6e0df1c74 Fix reading of git format-patch output
Task-number: QTCREATORBUG-12627
Change-Id: I7df1fe27f6502895ab9c82178084d2b631468c5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-04 10:55:28 +02:00
Christian Stenger
ea675821e3 QmlPuppet: Fix linking on MacOSX
Change-Id: Ib38b0059c24b9bddb2aa79ba45347e00f8972c77
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 10:50:38 +02:00
Orgad Shaneh
ac33df0d7a SDKTool: Change DeviceType from QByteArray to QString
Change-Id: I224b6723891df4a8073fae327def13c0b41e8541
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 10:38:48 +02:00
Daniel Teske
5751f7117c CustomExecutableRunConfiguration: Remove nested event loop
Nested event loops are dangerous and in this case lead to a crash.
So change the api of ensureConfigured to not use a nested event loop.
The CustomExecutableRunConfiguration then has to manage the dialog more
explicitly. Also this makes the dialog non modal, since it should then
cope with every situation.

Task-number: QTCREATORBUG-11416
Change-Id: I2af782915c148f8dff1b0df54fdb64aa83f684d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 10:35:10 +02:00
Orgad Shaneh
42bbae26a3 Git: Do not suggest tag name for local branch
This causes unnecessary name ambiguity.

Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-08-04 09:49:39 +02:00
Orgad Shaneh
117436a65a DiffEditor: Use explicit DirectConnection for context menu
The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-08-04 09:26:32 +02:00
Thomas Hartmann
db5a4ac447 QmlDesigner.PropertyEditor: Fix left padding for SpinBox
We use left padding instead of a prefix.

Task-number: QTCREATORBUG-12781
Change-Id: I0c89e3592ad0ca9c498d33930ef2742ec970f8bb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 18:17:39 +02:00
Joerg Bornemann
ef4057e7b2 WinRt: remove superfluous includes
Change-Id: I4385cf9ec71d85e70984fb2225b772743991e418
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-01 17:51:22 +02:00
Christian Kandeler
5996c1c300 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I203255543abb2170c256c8df38c37b956ea84a47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-01 17:16:56 +02:00
Christian Kandeler
ba31ab454d QbsProjectManager: Do not enable "check timestamp" option by default.
This is a workaround for user mistakes and should not be generally done.
It can result in e.g. redundant relinking.

Change-Id: Ia14854c9d260f5d7a8175d105b9bce896fcdeebf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-01 16:36:54 +02:00
Christian Kandeler
f488c10c5a QbsProjectManager: Fix project node operations.
The qbsProjectData() member function always returned the top-level
project data, which messed up a couple of things, for instance
"build sub-projects" and the node tree updates.
Instead, return the project data corresponding to the node.

Change-Id: If40c441c62334f0069a5fe3cb4873cf973baf135
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-01 16:30:00 +02:00
Leena Miettinen
49e6e15384 Doc: remove or hide docs for unsupported QML types
Flipable, StatusBar, and ToolBar are no longer visible
in the Library pane.

Change-Id: I5258ff950e83a49c90b5246d5957d8c9e6382657
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-01 14:40:26 +02:00
Robert Loehning
b2682fee22 Squish: Remove workaround
Just doing as the great wise frog tells me.

Change-Id: I73c07142cd902ac3b89f8c00597087d7d550a2ee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 14:31:39 +02:00
Thomas Hartmann
1076e879f1 QmlDesigner.Rewriter: Blacklist a couple of imports
Some imports are known to create trouble in the designer.
There is no reason to allow adding imports using the designer, that
will just create issues.

Change-Id: I95437f39c02fd06650285a5184a77669ae32b705
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 14:22:48 +02:00
Daniel Teske
d7551d0cc2 CustomExecutableRunConfigurationWidget: Make different use cases explicit
Change-Id: I435ce0fe59d9e5d937e5ed3ed06ddbf4a54f967d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-01 12:13:22 +02:00
Christian Stenger
5a06e6f903 Squish: Revive WELP02 for Squish 5.1.1+
Change-Id: I432494320cbbd4f19e0386a19183d0b9476054ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-01 12:11:48 +02:00
Tim Jenssen
0cfab4ca43 QmlDesigner: using old QRegExp works on all Qts
Change-Id: I9650efac738c76b8ace531416ac8e4664f637ffb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 11:21:41 +02:00
Tim Jenssen
186f82a730 QmlDesigner: SharedMemory key needs to be the same with all Qts
Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
v3.2.0-rc1
2014-08-01 11:17:30 +02:00
Tim Jenssen
2bfd14dbf8 QmlPuppet: Fix compile with Qt older than 5.2
Change-Id: I0ef3c5e374b1b01c22b553b99dfbd8eb7783fa90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 10:40:21 +02:00
Fawzi Mohamed
1a26446186 qmljs: do not try to dump without uri
qmlplugindump --path always fails, so skip it

Change-Id: Ica2d25c864104aa77efbc26913b079c98ff5e283
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-08-01 09:53:03 +02:00
Daniel Teske
92cdd7045b CmakeProject: Don't crash on addKit + cancel
This was introduced by adding the remote linux support for 3.0 in
328a24edee. If the user cancels the
run cmake dialog, no buildconfiguration is created. The adding of kit
should then not happen. A target without a buildconfiguration should
not happen.

Task-number: QTCREATORBUG-12773
Change-Id: Ic43c5cc13f9e114ea24cc97154a6c084125f6318
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 07:40:09 +02:00
Alessandro Portale
434389bd93 Make strings translatable
Change-Id: I1dc1d306d0c1e8070e75a73c23f622389f06fad1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-31 21:06:06 +02:00
Tim Jenssen
3d06c00e9b QmlDesigner: use explicit build type for puppet creation
Change-Id: Ibeba1cc874ddfd083113249a408caa05e1e012a5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-31 19:43:25 +02:00
Daniel Teske
bb42157f04 Android: Prevent crash if running on a terget without deployconfiguration
Should be impossible to do, but the stacktrace in the linked task shows
that it is possible somehow.

Task-number: QTCREATORBUG-12776
Change-Id: I1f2054bbaa132c29dfc4579fb7020f364bddd939
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-31 17:56:10 +02:00