Commit Graph

34703 Commits

Author SHA1 Message Date
Ulf Hermann
2fac0c5fbc Android: Try to parse the QML port from stderr
Most of the time the port is not announced on stdout but on stderr.

Change-Id: If72bb7f65dcfe7e697de2545d33e99ddb6363ecf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-17 10:34:42 +01:00
Friedemann Kleint
a20e698216 QNX: Fix compilation with Qt 4.
Change-Id: I2a3aadeaebca04ebacc7f199fb953098113c92b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-14 21:54:15 +01:00
Fawzi Mohamed
9c17e9cb72 ios: simulator support for Xcode 5.1
update iossim to be based on version 1.9.0, so that we can support
the new Xcode 5.1. Keep the old version around and use it
with older Xcode.

Task-number: QTCREATORBUG-11714
Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-14 21:35:28 +01:00
Ulf Hermann
64f31afd5d QmlProfiler: Fix order of updates to timeline contentX and contentWidth
contentWidth has to be updated before contentX as the WheelArea
underneath will clamp its horizontal value to its bounds on change and
thus break the update to contentX if contentWidth is growing.

As contentX is automatically updated by changes to contentWidth it's
generally a good idea to prevent any reactions to  that with a recursion
guard. When updating contentWidth before contentX this becomes necessary
for correct operation.

Task-number: QTCREATORBUG-11699
Change-Id: I34fff7a55e93745d658e8cbb5ac3d430a42770e8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-14 17:07:01 +01:00
Friedemann Kleint
94b13cdd9f Remove trailing newlines from QML Puppet messages.
Change-Id: Ibe184979568f5ba2d4635cf36c9206cf56d87bac
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-14 16:28:42 +01:00
Frantisek Vacek
2c732970b8 Qnx: Add support for qml profiler in BlackBerry/Qnx
We cannot set -qmljsdebugger arg in bar-descriptor.xml file since
it can be done in DeployStep only. QTC architecture do not allows this.

Current approach modifies already deployed MANIFEST.MF on the device.

This patch has nothing to do with QML analyzer for pure QNX,
it's purely for BlackBerry.

Task-number: QTCREATORBUG-10520
Change-Id: I89e83c6ff70a7a35344ff7e3fe573fc19e797ccb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-14 16:27:55 +01:00
hjk
1910fe9175 Debugger: Add dumper for boost::container::list
Change-Id: I251a859ca63bf932cb0d22ef11b5492b75ebcadd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-14 16:17:29 +01:00
Leena Miettinen
0962c0b03f Doc: remove Qt Simulator macro
The Qt Simulator is no longer mentioned in the docs.

Change-Id: I8730e45c75f2e69dadc053ebfa205aa7b6eef5fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 16:14:05 +01:00
Leena Miettinen
7b088afbe9 Doc: don't use the term SDK in connection with Qt
Replace with "Qt distributions" or "installers" or rewrite
in some other way.

Remove references to installing Qt 4 SDK, because it is
no longer available for downloading.

Change-Id: I291f82702e21d953f2efbb0e634d6454b4bc17b9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 16:12:10 +01:00
Jarek Kobus
2c42b06f00 Fix some strings.
Change-Id: Iaac415d25ebfac507df73fc4b3977425df521979
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 15:57:28 +01:00
Kai Koehne
12445a050c Fix QT_VERSION checks in logging.h
0x520000 is minor version 20. Use QT_VERSION_CHECK to avoid such
stupid errors.

Change-Id: I4408c0796b015f509ca9cfa8535dfdaf1603acae
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-14 14:39:00 +01:00
Marco Bubke
e9c5e60d50 QmlDesigner: Improve error message for puppet
Task-number: QTCREATORBUG-11713
Change-Id: Ic8721235a6db34803585d69f5bb8c2b2439e04eb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-14 13:50:27 +01:00
Daniel Teske
8a8afe42b1 ResourceNode: Remove unnecessary update() call
Change-Id: Iea72f2cb02b6b983cb90d4dd09c5e0fc1f8c0c3f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 13:07:26 +01:00
Christian Stenger
6f2c3d9cb3 LLDB: Stop creating zombies when executing dumper auto tests
Change-Id: I8a9d2e9e0027f60a9801ba9a20aab1c5e2991bdb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 13:00:55 +01:00
Ulf Hermann
0d3f7f0deb Android: Treat "fatal" messages error output
If you trigger a fatal signal e.g. dividing by 0, you'll get a message
with an "F/" prefix. That should be red, too, just like "E/" and "W/".

Change-Id: I8bef7ebf4e8c7d7ac3794750306073043852634b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:57:28 +01:00
Alessandro Portale
1b50faef8f WelcomeScreen: Adding links to Qt Account and Qt Cloud Services
Change-Id: Iec39fd4a44671c284e7442f40a1c3156a299437e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:17 +01:00
Alessandro Portale
1dfa2da87c WelcomeScreen: putting the "icon plus link" into a component
...more links to come...

Change-Id: Ic500f38995bf515eda80c0720d1fdd7718e5ff54
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:08 +01:00
Ulf Hermann
f9864efea7 Android: Properly split stderr into lines and drop unrelated messages
Change-Id: I860cddcea23692fd8c9b69b849e7b1fb50e9113d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:43:43 +01:00
Kimmo Leppälä
ffbb129f18 Fix deployment to Android virtual device
With the latest Android SDK Tools installed deployment to Android
Virtual Device failed since the format of "android list avd"
changed to include device tag information.

Task-number: QTCREATORBUG-11658
Change-Id: I72a2427dedfaf0cd7638b9805c545fda0bd6598e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kimmo Leppälä <kimmo.leppala@digia.com>
2014-03-14 11:18:40 +01:00
Christian Stenger
c3a23cb862 Squish: Rewrite checkQtCreatorHelpVersion()
Change-Id: I994379476ab52df75a4a34a8e0db025ee2f3df70
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-14 08:02:52 +01:00
Robert Loehning
b071a0ad07 Squish: Update tst_git_clone
Command line information appears in Version Control view,
not in the dialog anymore.

Task-number: QTCREATORBUG-10531

Change-Id: Ib3a501e32d6105a78d8e4f4f1ad019de22e3ef3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-13 19:23:51 +01:00
Kai Koehne
bd1a922b2f Fix detection of language in QmlJSModelManagerInterface
Change-Id: Icdc458b7deab5903fd997051947224f9c8d26945
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-13 17:17:20 +01:00
Ulf Hermann
f5dc6bed45 Android: Don't read from adb logcat while PID isn't known
Otherwise we throw away important parts of the output.

Change-Id: I7ab6989c19660bcbb53d6ff61eda62878044ded2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-13 16:35:05 +01:00
Daniel Teske
911f6b5159 ResourceNode: Fix renaming prefix
Task-number: QTCREATORBUG-11719
Change-Id: Ib24dd7bf644bbebca3d9a694ec2b98709cfd6cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-13 15:45:45 +01:00
Nikolai Kosjar
349de9331c C++: Fix weird logic in usage of TopLevelDeclarationProcessor::processDeclaration
As the name function name suggests, true should be returned if the
declaration should be processed. Otherwise false.

Change-Id: I8d266d99c579b331fee8772bde47aa1a466dae9c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-13 15:41:01 +01:00
Nikolai Kosjar
0832a0deac CppTools: Replace 1-bit bit field by bool
...since it's aligned away anyway.

Change-Id: Id8a3c6feeb53f5d6f4f4338ea9031d7c57f312d0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-13 15:40:25 +01:00
Nikolai Kosjar
8f6b4c784d CppTools: Remove useless parameter in recalculateSemanticInfo()
Change-Id: I24b6f6d698051d1ccfe3f0d83078c26d8de193fb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-13 15:40:07 +01:00
Fawzi Mohamed
2a9cde9468 qmljs: adding Qml to companion lanaguages of Unknown
Correctly collect qml files when the language is not specified.

Change-Id: Ieebfc543108ddb716479ac4524ef14063dd225ea
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 15:20:26 +01:00
Joerg Bornemann
5b9e0bde1e WinRt: fix name and description of the deploy step
Change-Id: I5550395cfff2031b938a022f9ec01817e7248864
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-03-13 14:38:44 +01:00
Joerg Bornemann
8f1b78bf8a WinRt: add windeployqt configuration widget
A simple line edit to display or change the arguments that are
passed to windeployqt.

Task-number: QTCREATORBUG-11693

Change-Id: I059f5c2af3fce17f9f8463ecfa2af91f21ffe6d8
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-03-13 14:38:14 +01:00
Kai Koehne
d035dbb184 Examples: Remove loading of *.xml files from Qt demos/examples dir
Not sure what this code path did originally, but since at least
Qt 4.8.0 examples, demos manifest files are only in doc.

Change-Id: I6edf1f712fc06d290edf0fe978a6635966084e60
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:37 +01:00
Kai Koehne
41b57bfd0e Remove Qt 4 fallback for examples browser
Remove fallback file, and rather use the examples-manifest.xml,
demos-manifest.xml files that are part of Qt 4.8.0 or newer.

Change-Id: I6291bd01b75b891a5ddab7fb01cdfc29ed8bec34
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:29 +01:00
Kai Koehne
0d23d2d41b Move management of 'selected' Qt version to ExamplesListModel
Change-Id: Ia4c73a0e9985e968265d7698e3a0a3cc58dc7aaa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:25 +01:00
Kai Koehne
dc72ebd273 Unify selection of 'valid' Qt versions for welcome page
Change-Id: I79ba4ac9f132a535efd9d362790b8e1d2b62d900
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:22 +01:00
Joerg Bornemann
fdb543620e WinRt: fix detection of desktop Qt builds
Task-number: QTCREATORBUG-11715

Change-Id: I57ccece77c024c0814eb51a67e6e40faa0bb5ee5
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-03-13 13:55:12 +01:00
Friedemann Kleint
fe184c4504 Fix warning about truncation from int to bool in resource editor.
Change-Id: Id7ea03b27e9fd36e5f452736e81992089dfc73b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-13 13:20:27 +01:00
Daniel Teske
0ae75355db ProjectTree; Fix directoryFor() to handle new resource nodes
The resource nodes do have a special path, the code assumed that
folder's path were always directories. This is no longer true.

Both pathFor() and directoryFor() suffer from path() being special for
VirtualFolderNodes and ResourceNodes. That specialness is probably not
a good idea, cleaning that up is a longer term task.

Task-number: QTCREATORBUG-11677
Change-Id: I995e82b7ed361b5e2c6681484074c65e2175c96e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-13 13:17:27 +01:00
Daniel Teske
e060086f5a Android: Don't let the user choose a stupid ANDROID_PACKAGE_SOURCE_DIR
On creating a AndroidManifest.xml we ask the user where to put the file,
which as a sideeffect also sets ANDROID_PACKAGE_DIR.

Since we copy everthing from ANDROID_PACKAGE_SOURCE_DIR into the build
directory, using the project's source directory is not desireable.

We now show a big error if the user tries that.

Task-number: QTCREATORBUG-11708
Change-Id: I7fade3efac0b7466cad8e83a92c2115d0a70c683
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-13 12:31:02 +01:00
Joerg Bornemann
1f15995bca WinRt: add --qmldir option to windeployqt call
Task-number: QTCREATORBUG-11696

Change-Id: Idd2eab5cc31e11320b2ba6cc75ca376d1b3acb5c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-03-13 12:28:17 +01: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
Thomas Hartmann
402ea02821 QmlDesigner: Bump version of QmlPuppet
Change-Id: I1e791e8d39e48408239e1ba980ff0751fe8278dd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-13 11:26:19 +01:00
El Mehdi Fekari
073fd91705 Qnx: Package user assets as well when bundling Qt libs
Task-number: QTCREATORBUG-11652

Change-Id: Ib5c26b0b25542eb8e92f5ff65a4f3ec31b82bfff
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-03-13 11:00:29 +01:00
Joerg Bornemann
073fd1e5b0 WinRt: remove unused includes
Change-Id: I7091cdf8e8bed73cdef186f826fea72c050844d5
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-03-13 10:25:30 +01:00
Joerg Bornemann
4830211759 WinRt: simplify project file path retrieval
Change-Id: If2542b0c22728ae2567e4d42de3a7f7d6830c350
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-03-13 10:25:25 +01:00
El Mehdi Fekari
715aeb4051 Qnx: Fix runtime check when debugging
Those changes were missing in the commit introducing the check...

Change-Id: I7c2977b255063235a8f81c488c200c9b93b36482
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-03-13 09:46:19 +01:00
Friedemann Kleint
468039932e Debugger: Fix message about attaching to local processes.
Change-Id: I2400e6a4121f72efc1934252e2998b3060dd4c47
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-13 08:44:25 +01:00
Nikolai Kosjar
60f9046d5b CppTools: Save some stats by using correct include paths
..while initial parsing.

Change-Id: I202da3f4f9e445a28e9726352fc005488efe2893
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-12 21:03:40 +01:00
Nikolai Kosjar
7c0bb193d8 CppTools/QmlJSEditor: Hide "Preserve Case" for Replace Symbol Under Cursor
...since it does not make sense for symbols.

Task-number: QTCREATORBUG-11669
Change-Id: Ic249cb15cdb3b324a9b215323acd802a33797100
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-12 21:01:33 +01:00
hjk
906b813640 Debugger: Simplify LLDB Qt namespace and version extraction
Change-Id: I00b0e32da56bef613220d98f9d99758b47b3daf5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 18:05:52 +01:00
Tobias Hunger
4d70a52d27 SDKtool: Fix get operation
Sometimes I think nobody ever uses the sdktool:-/

Change-Id: I91d1e21db982e802394d30fbdd75ab0f6b3a0961
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-12 17:56:58 +01:00