Commit Graph

33262 Commits

Author SHA1 Message Date
Tobias Hunger
b9813b7c91 Qbs: Make "Reparse Qbs" force a reparsing
... even if Qt Creator thinks all is well.

Change-Id: I40fa61d51c8e18a389bedf7d8afb927bbb88acd5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-12-04 13:15:17 +01:00
Tobias Hunger
7af5674c15 Qbs: Add --check-timestamps option to QbsBuildStep
Change-Id: Ieeaac68cde486458eef067fc1129ba11053759e8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-04 13:15:03 +01:00
Fawzi Mohamed
ea34160bef iosdeploystep: remove unused code
Change-Id: Ic3f068f2619324bfb5eb674377ce55a362c2d919
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-04 13:12:26 +01:00
Erik Verbruggen
af2900ce72 C++: prevent possibly highlighting a document twice
Possible when the highlighter does not need semantic info to run, and is
started through onDocumentUpdated() and updateDocumentNow().

Change-Id: I720299730213ac196143a273fb60cee8e43111f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-12-04 10:40:02 +01:00
El Mehdi Fekari
7620be4a69 Qnx: Remove unused code
Change-Id: I385abd7b36e5a023ccf735cc11ab23ac4fb8e831
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-04 09:49:35 +01:00
Orgad Shaneh
a06c5ef151 CppEditor: Cleanup quickfixes
Change-Id: I19fb785372291f66b756cf5be1fc941870c304c3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-12-03 19:20:24 +01:00
Ulf Hermann
d36cb8b476 QmlProfiler: Remove custom canvas implementation
The canvas integrated in QtQuick does the same thing. We can remove a
lot of code like this.

Change-Id: I6425ae4e1b542107defd9d76fa5755712a0f8613
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-12-03 15:01:16 +01:00
El Mehdi Fekari
1233eb5670 Qnx: Add a missing include
Change-Id: I0ef3689347e9f87fba461be577536b9926b6a50e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-03 14:26:20 +01:00
Daniel Teske
0bb684345d Android: Rename target sdk to build sdk in the deploysetttings
Change-Id: Ie1e6d02f29d236da9502c03d0e7fa7e745df8f7d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-12-03 13:37:34 +01:00
Daniel Teske
8d110837e5 QmlProject: Prevent renaming .qmlproject files
That doesn't work, it doesn't look to hard to fix that, but the use case
for it is rather small anyway.

Task-number: QTCREATORBUG-10934
Change-Id: Idcb1fab96a67330e998590b70760b3c97e4cb780
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-12-03 13:21:01 +01:00
Eike Ziller
920d524d38 Merge remote-tracking branch 'origin/3.0' 2013-12-03 12:46:39 +01:00
Christian Kandeler
580c1c35af Update qbs submodule.
This updates qbs to the HEAD of the 1.1 bugfix branch, which has
a number of bug fixes on top of what's in the RC.

Change-Id: I95e3c8b45befb639c4a016b32cbe88145baae16f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-12-03 12:11:30 +01:00
hluk
b1a714ed44 FakeVim: Fix infinite loop when replacing empty text
Change-Id: Ie4ba6420889b0a6a5712b43a11f8366aa9a30edc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-03 11:40:51 +01:00
Nikolai Kosjar
223ecc70a2 C++: Compile fix for tst_lexer
The trigraph sequence somehow confused qmake. The moc file was not
generated.

Change-Id: I4016947b5c8efa350d1813737651143d8687d299
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-03 10:54:15 +01:00
Robert Loehning
4fd4f5d9fc Squish: Remove unused function
Change-Id: I2860d77dcb6a571e6af0e8aff86b997c12dafc90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-03 10:42:16 +01:00
Robert Loehning
7f492541b9 Squish: Remove unused objects
Change-Id: I36d5174e26b853777792f69eac4df16efc52292b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-03 10:41:49 +01:00
Robert Loehning
4d6cb992b1 Squish: Use generic function textUnderCursor(...)
Change-Id: I7ea6e9af1435e716266f4dfd917fe9ac568a67a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-03 10:41:39 +01:00
Tim Jenssen
62fed3c407 install x86 vcredist only if it is necessary
Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-12-03 10:36:51 +01:00
Niels Weber
9e2caea36f Fix hang at end of installation.
Task-number: QTIFW-416
Task-number: QTCREATORBUG-10974

Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-03 10:29:55 +01:00
Nikolai Kosjar
796fcaf1d2 Revert "C++: Fix highlighting for lines with predefined macros"
This takes too much memory. For qtcreator.pro the numbers are as
follows:

    Patch applied:  ~ 1600MB (RES)
    Patch reverted: ~  510MB (RES)

This reverts commit 4c2daa90ce.

Task-number: QTCREATORBUG-10973
Change-Id: I843bd7c1ea4a26a1ec55ddc14c2a34a98d040922
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-12-03 09:53:26 +01:00
Ulf Hermann
132954f9f3 WelcomeScreen: Don't use clipping
Aparrently clipping is slow in QML, so we use elide and manually control
visibility instead.

Change-Id: Idb743a8daec04b028f103a075a5416729f0e2a16
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-03 09:47:18 +01:00
Ulf Hermann
e2ce74f5a6 WelcomeScreen: Scroll the example grid view with the main scroll view
By tying the scroll offsets and visible areas of the two scrollable
elements together we avoid excessive loading times for the examples.

Change-Id: I6522ef3e6c0454e5bb05bef143953d8d1850ffdc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-03 09:47:12 +01:00
Ulf Hermann
06a23c6da5 QmlProfiler: Handle enable and show signals for zoomslider in C++
As it's hard to pass arguments for signals from non-QML-mapped objects
to QML objects handle the signal in C++ instead and just directly set
the properties.

Task-number: QTCREATORBUG-10943
Change-Id: I039f6938db3d7e64ca1a4bcff2f0f6aa79c65219
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-03 09:47:03 +01:00
Orgad Shaneh
2d415c8228 Git: Use initStyleOption instead of setting options in paint
Change-Id: Idc14c157478c7092fce7d688044cb0a99e47bebe
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-12-03 09:12:46 +01:00
Kai Koehne
2d028ceec4 Remove wrong Qt Creator version number from Qt Quick template files
Task-number: QTCREATORBUG-10975
Change-Id: I6eb87a789ce88b1f3f298ef65b8bb96ce2348501
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-12-03 08:52:32 +01:00
Thomas Hartmann
d9a54fdeef Welcomepage: Is should not be possible to uncheck tabs
Unchecking a tab has no clear semantic.

Change-Id: I9bb3d659a76655846c79cabbe23717119ed0cf08
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-12-02 19:07:56 +01:00
hjk
b0da255acf Debugger: Restrict QTimeZone use to Qt >= 5.2
Change-Id: Iba786c265ddf7163fd7bb779d103065de3f83547
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-02 16:43:26 +01:00
Leena Miettinen
a5375cbe32 Doc: replace "Start Android AVD Manager" with "Start AVD Manager"
The UI text changed, because "AVD" means "Android Virtual Device":
7d266c648e.

Change-Id: I9f581a5c580f38880398d0e3aed35db5fd140b98
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-12-02 16:32:09 +01:00
David Schulz
cfe84eaae2 Debugger: Remove gcc version output when using the cdb in the dumper test.
Change-Id: I5560c8a5bc3eaefb8c40256dff4082b9b380e1f3
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-02 16:13:16 +01:00
Eike Ziller
f8677917f2 New file name convention for source packages.
Change-Id: I6ec2744379751708bbd1f36816dba7e5b976270d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 16:05:47 +01:00
Fawzi Mohamed
92cd92bb21 ios: improve kit generation
* remove all unknown autodetected iphone* kits
* update more thoughly existing kits

Change-Id: Ia71328a3f88eaede28f9199f1c301f23a88ad58b
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 15:47:08 +01:00
hjk
9a9ec06d48 CPlusPlus: Remove unneeded declarations
Change-Id: I5bf4febd1ec3b77e05f883015a99ed019ddfb55c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-12-02 15:38:02 +01:00
Eike Ziller
0a893fc6b4 Merge remote-tracking branch 'origin/3.0' 2013-12-02 15:33:56 +01:00
Tobias Hunger
7206a46952 TextEditor: Add history completer to path choosers
Change-Id: I32f7ee73474bd9a5c1d7d435d4d2969c4126662a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 15:22:32 +01:00
hjk
242cb17919 Debugger: Adjust QDateTime dumper for Qt 5.2
Change-Id: I53a5701c9d1791e2705eafb258ff440f97e53b87
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 15:14:42 +01:00
hjk
dc30a4a2bd FakeVim: Prevent crash in scrollToLine with Qt 4
There seem to be cases where QTextLines::isValid() returns true but
its lines_ are empty.

Change-Id: Ia4b9a66aec8d10754f7ff7dd0c90e7295e2a2220
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 14:53:56 +01:00
Tobias Hunger
95306dbf65 CppTools: Add history completer to path choosers
Change-Id: Iaedd5eb2890d19761c342d248e600b50e43be979
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-02 14:40:40 +01:00
Tobias Hunger
391dea86a7 DebuggerItem: Compare against original item from DebuggerItemManager
Compare against the original item from the DebuggerItemManager, not
to the item stored in the model. This will keep the change flag, even
when switching back and forth between items in the model.

Task-number: QTCREATORBUG-10954
Change-Id: I54535c45e3c3e45fabbf83e0a35c3bd674158892
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 14:25:48 +01:00
Eike Ziller
ea64a75a8d Installer: Use right tag for specifying window icon
Changed in IFW 1.4

Task-number: QTCREATORBUG-10010
Task-number: QTCREATORBUG-10243
Change-Id: I17ed5ee7bdf5fdc093351ac0c148eb5395fe699f
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 14:18:23 +01:00
David Schulz
0068b9ee08 Cdbext: Add simple dumper for QTextCursor.
Change-Id: I092ab69445028c8b359ae0edca764f17b4a6d6cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-02 14:17:48 +01:00
hjk
6ab4adabf3 Debugger: Prevent overwriting of pre-defined Abi values
Todo: Add a button to rescan ABIs to UI after UI freeze.
Currently you have to change the debugger command and then
change it back when replacing a debugger with a debugger for
something else in place.

Task-number: QTCREATORBUG-10755
Change-Id: Id3cf1da3f198b60e6c538e5478b11f1d6d379ff9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-02 13:44:48 +01:00
Sebastian Paluchiewicz
ab70e6c27e Copy filename to clipboard as extension to Copy full path to clipboard.
Change-Id: I832c58b670e6957f839caa01d15dc2c3ce01df5d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-12-02 13:25:00 +01:00
hjk
634519a509 ProjectExplorer: Reference icon for Code Style settings page
Task-number: QTCREATORBUG-6357

Change-Id: Ia622a133208ce1df605a10cef809f259dc5a0274
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 13:21:43 +01:00
Fawzi Mohamed
11037dfcb2 ios: fix compilation on other platforms
fix ternary operator types

Change-Id: I4f9a0eb100fd6ca4e65e91ef67a53331d3f8faaa
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-02 13:19:52 +01:00
Tobias Hunger
dc7f2a9bd5 Target: Fix loading of multiple deploy configurations of the same kind
Task-number: QTCREATORBUG-10923

Change-Id: I3ae4961225604d51864cf78f0e633c82e55aa2d8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 13:08:22 +01:00
Eike Ziller
87e2e5b977 LLDB: Autoselect thread that was stopped in
The integration was only doing that for breakpoints, but not for
stepping etc.

Task-number: QTCREATORBUG-10813
Change-Id: I4be7ec691e839bf062ab67587062cba00cc85e4f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 12:53:45 +01:00
Fawzi Mohamed
d5a8adc156 ios: ensure that the private dependencies are resolved by dyld
Change-Id: I36f493dc83a906fb2291b156488531cfff633d4a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 12:35:39 +01:00
Topi Reinio
9cb4b52ed4 WelcomePage: Remove outdated tutorial videos
Remove following videos that use outdated terminology:
    - Qt Quick Elements, Part 1
    - Qt Quick Elements, Part 2
    - Qt Quick Elements, Part 3

Task-number: QTBUG-35187
Change-Id: Iacecf06b4868ecbc71fa2b7d3cc3ad23533e88b4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-12-02 12:16:04 +01:00
Ulf Hermann
2f8f51912c QmlProfiler: improve selection behavior in timeline
When selecting ranges in the timeline the selector would sometimes hang
or behave weirdly when moving back. This was due to incorrect logic in
the selection bounds calculation and because the vertical flicking would
steal mouse events.

Change-Id: I14074463422d1d9a0aa8ecd1f88847e7330c9b6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-02 12:12:29 +01:00
Fawzi Mohamed
0489adf0cb iostoolhandler: thighten stop process
gurantee that finished is emitted also when the process fails to start
and always after the sub process has actually finished.

Change-Id: I716ebf62074dc77790716e60e88348a932cbe9f6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 11:03:56 +01:00