Commit Graph

34631 Commits

Author SHA1 Message Date
Tobias Hunger
7e64ecad2b VersionUpgrader: Remove Project * from upgrade method
The VersionUpgrader is supposed to be generic and not bound to .user
files. Move ahead with the merge of the settings refactoring.

Change-Id: Ie781a1b23dd60d4b15f7fe260f3dad315a8fa503
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-14 12:34:13 +01:00
Benjamin Zeller
7a6f40b88a cmakeprojectmanager: Rename CMakeValidator to CMakeTool
Renamed CMakeValidator to CMakeTool and renamed files
to prepare for further refactoring

Change-Id: Id6e64e3a39ec36ca3aa8b08bf859ae1345f1a137
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 10:58:11 +01:00
Tobias Nätterlund
8ee451b94a BlackBerry: Do not add bar-descriptor.xml to .pro file
The bar-descriptor.xml file will no longer be added to the .pro
file as OTHER_FILES, as it was not necessarily the file listed in
the .pro file that was used for creating the package later on,
as that is configured in the deployment settings.

Instead, the file configured in the deployment settings is now
added to the file project tree, and kept in sync if the user
changes the file to use for deployment.

Task-number: QTCREATORBUG-10054
Change-Id: I3068fedf8ea17f4e60131f9106b3844086d1552b
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-03-14 06:52:22 +01:00
Benjamin Zeller
3b786e7faf cmakeprojectmanager: Move SettingsPage and GeneratorInfo in extra files
Move CMakeSettingsPage and GeneratorInfo into extra files
to prepare for refactoring

Change-Id: Idee2e9f807a961c0eee9c15198ee0966ecc16e83
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 16:55:17 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1'
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
2014-03-11 13:39:55 +01:00
Joerg Bornemann
01715c6172 use the .qbs file extension for qbs project files
Change-Id: I4a6a8a81ca687b29101ae66ed22a2456e8991d55
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 11:32:06 +01:00
Leena Miettinen
19b52fb509 Doc: using experimental WinRT plugin
Change-Id: I669048c839dc7d78984923b21f6bfba69d551a43
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-03-11 11:10:03 +01:00
Daniel Teske
77d885bf3a Android: Handle offline state
Task-number: QTCREATORBUG-11056
Change-Id: I81b58d08b66b4fb8322e5c6c4935ddfb9470318f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-11 11:04:08 +01:00
Robert Loehning
3befd91113 resourceeditor: Make qrc-files' context menu more consistent
Change-Id: I97e5354bc892194d34ba968b0428bbc3bfdcd11d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-11 10:59:05 +01:00
David Schulz
69ea24b011 Debugger: Fix a bunch of dumper test for the cdb.
Change-Id: I852f235cdb24086964b07869b9435f9e61fbb38b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-11 10:47:07 +01:00
Fawzi Mohamed
c4b617ab12 ios: correctly handle exe path in subdir projects
Change-Id: I77c90933bf2f0fe9c2ae59bf76638adf995c368a
Reviewed-by: Markus Goetz <markus@woboq.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 10:14:10 +01:00
Ulf Hermann
cc4aae532d QmlProfiler: Show multiple rows for animations from different threads
Task-number: QTCREATORBUG-11659
Change-Id: I40ed0ff755b5583947de08207993325dc1039d87
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-11 10:14:03 +01:00
Ulf Hermann
14dc364c2e QmlProfiler: Remove pointless struct
Change-Id: I9a67048ba5c4dfc238c9f8456601922c4528a53c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-11 10:13:48 +01:00
Friedemann Kleint
c3f8f62f2a Fix dialogs in ProjectExplorerPlugin::buildQueueFinished().
Use ICore::dialogParent(), fix capitalization, remove exclamation
mark and trailing newline.

Change-Id: Ia9b28aeb95e2047595173b41fc69dcf6326e0f1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-11 09:33:27 +01:00
David Schulz
64c4779244 CdbExt: Make max array size configurable.
Change-Id: I1bbf028e94160701726afc6cad1f4f529287a451
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-11 08:31:37 +01:00
hjk
f5d97d48f8 Debugger: Reword UnstartedAppWatcherDialog label string
"Reopen dialog when application finishes"

Change-Id: I7b33b5773f384298fd6fffcbb272ec9c308c0d90
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-10 18:00:22 +01:00
Christian Stenger
cc96d02a41 Tests: Extend tst_offset
Change-Id: I451502e3dc99bf80e2eb540795f04ea7f8a3439f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 17:57:32 +01:00
Christian Stenger
f8afa89ba7 Tests: Fix QThread dumper for old gdb (~7.4)
Change-Id: Ifbaf8f326744e9e271b407d8650ffcc47b890889
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 17:57:09 +01:00
Nikolai Kosjar
cd507af476 CppTools: CppPreprocessor: Read file only if necessary
Change-Id: Ia60d3e1907f9238f873f016d844095084b76ad6b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-10 17:36:43 +01:00
Christian Stenger
e2b8ef4592 Squish: Avoid Squish crash in tst_rename_file on Mac
Change-Id: I51b16970504d85eed63cf0ddd7b0ff07b6226273
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-10 16:03:35 +01:00
Christian Stenger
1b7de8c37c Squish: Fix detection of clang++ on Mac
Change-Id: I02f68f7942a3774c686e1482d275e22a6037af2a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-10 16:03:27 +01:00
Christian Stenger
87abfc3624 Squish: Limit suite_CCOM to Qt4 kits
Change-Id: I49016d432221f39bc525fa4a548968294f139976
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-10 15:57:52 +01:00
Friedemann Kleint
2a27ed5c8f Fix messages in QNX.
Change-Id: Id9199607e787a04a3c90596e30e5ca5f249e7f07
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-10 14:36:48 +01:00
jkobus
b8046e603d Don't register mimetype for diff editor
Task-number: QTCREATORBUG-11624

Change-Id: I9eeeeeb862e335c1a4d5cbd80d0908297ad6d1db
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-10 14:35:51 +01:00
Nikolai Kosjar
4bf11c7df6 CppTools: Add diagnostic message for non-existent absolute paths
Change-Id: I9a05a92c1adc37db0c918127715714d1f6d2a78d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-10 13:42:51 +01:00
Nikolai Kosjar
aa796a9fc0 CppTools: Add all diagnostic messages
...of type 'No such file or directory' to the CPlusPlus::Document. Only
the first one was added and as a result, the editor only wavely
underlined that one.

Add also diagnostic messages if it's not possible to get the file
contents.

Change-Id: I8389d8e6af9480ea6712759ce5e130e1dd8912f1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-10 13:42:43 +01:00
David Schulz
16e16dc405 CdbExt: Fix Dumping of a list of QStringLists.
Since Qt5 QStringList is a movable type.

Change-Id: I997ab9ef92646589bc150dcf0d0509084cdfd02d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-10 13:36:32 +01:00
Leena Miettinen
f3b9dd5b13 QML JS: fix messages
Fix punctuation and capitalization in messages.

Change-Id: I0de61d8594917a95175e3453ef9343f0d9cd208f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-10 13:14:49 +01:00
jkobus
b846840c52 Move more function into diffutils, fix calculateOriginalData.
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-10 13:01:29 +01:00
Ulf Hermann
16bfbceeba QmlProfiler: Allow filtering either JS or QML from the events view
As a lot of events show up as QML bindings and signals and as
JavaScript functions the events view can be hard to navigate. This
change allows the user to either filter out JavaScript events and make
it look like the old QML events view or filter out QML events and make
it look like the old V8 JavaScript view.

Change-Id: I9e0c1184da21263ae174f322b8fcd8ee5ca13f6d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-10 12:41:43 +01:00
Erik Verbruggen
ee299651df QBS: bump submodule sha1 to include compile fix for MacOS.
Change-Id: Ib8041a4f58dc4e3b289fffae8f4584344de757e9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-10 12:37:49 +01:00
Ulf Hermann
64af5c12e0 QmlProfiler: Deduplicate color selection and saturate colors some more
The original timeline colors are hard to see on certain devices. This
makes them stand out more from the background.

Change-Id: Icf6ef8a8ea360b7f47609f8673c4c6e22b091296
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-10 12:10:39 +01:00
Ulf Hermann
998bb89739 QmlProfiler: Use crisper left/down arrows for the timeline
Before they were rather blurry. The new ones are uncompressed and
strictly black/transparent. Also the "smoothing" is rather detrimental
in this case, so it's switched off now.

Change-Id: I38fe0bf9e3420a2077b5535958053718981bce4f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-10 11:57:55 +01:00
Eike Ziller
0d511290f5 FormEditor: Make it possible to switch from source to form
before designer is fully initialized. The action actually doesn't depend
on designer being initialized, so it can be registered directly at start
up.

Task-number: QTCREATORBUG-11244
Change-Id: I275517befa4dc94714b94a6cd665eb0361a3c45b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-10 11:03:32 +01:00
Daniel Teske
ca6efdcedc ProjectExplorer::New File Use addNewInformation also for context menu
So that the resourcenode can steal from it's parent

Change-Id: I97a21d94c0ddb0d217c48fd69dc808446763837b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-10 10:45:11 +01:00
Orgad Shaneh
5bb72be900 Debugger: Print traceback on dumper exception
Change-Id: I652d31b111eab464bf3301968fe273d24f0dad11
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 10:05:02 +01:00
Christian Stenger
5377b1497f Tests: Fix for using non-developer-builds of Qt
Change-Id: I7204637c0c8dc145331d4097c62ab4fb962fe204
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 10:04:27 +01:00
Christian Stenger
0cb3e81015 Tests: Compile fix for Qt4 on Mac
Change-Id: I17bad7e03a45f372d8c5ad08d8dbefe3797f227c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-10 10:01:06 +01:00
Leena Miettinen
f3d8f0916a Doc: Updated documentation for Beautifier
Change-Id: I3e32e93e41e3835f62884afab17f98fde95ce32c
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-10 09:56:51 +01:00
David Schulz
0f6846bdaf Debugger: Simplify the cdb output parsing in dumper test.
Change-Id: I5390e6514947002ddefcfe1fae36db5201749f1b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-10 07:39:25 +01:00
hjk
0543ad2199 Debugger: Fix mixup of {hexa,}decimal in auto test
Change-Id: I447bf58458540acc8ff901967a190c9f42961a6b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-08 00:02:43 +01:00
hjk
3a988262de Debugger: Speed up Qt version extraction
Change-Id: I20494f4cae410d430049b3a5e4ce397ac3917ddb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 18:56:21 +01:00
hjk
dbc474ef71 Debugger: Speed up Qt namespace extraction with GDB
Change-Id: Ic2a1296828d5aceb6c0aae0edbd165e3d0e86741
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 17:59:18 +01:00
David Kaspar
712d6df4ac Qnx: Fix for compilation error in c4717944f1c4de116e9074b7a38cd7ff29b1b16d
The QComboBox::setCurrentText() function is in Qt5 only.
Using equivalent QComboBox::setEditText() instead.

Change-Id: I5d45cc93bbfcaa7510c5192312c74f5f172f3a7d
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 17:50:50 +01:00
Leena Miettinen
fc1e1d1728 BlackBerry: fix UI text and messages
Fix punctuation and capitalization in UI text and
messages.

Change-Id: Ie3beaeda820090ecec94832b773c2f29a7bd0d95
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-03-07 17:10:29 +01:00
hjk
944d0bfa8e Debugger: Show Qt version in a more readable way in autotests
Change-Id: I3983be6a5cb5ab85ae0f5d116f055d1c858809f5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-07 16:32:34 +01:00
Leena Miettinen
fef3af4154 Resource editor: fix capitalization of UI text
Change-Id: I3ff91a79b046d053d6cf0fbc3f016eeb5393809a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-07 16:10:06 +01:00
Leena Miettinen
732bb7c2e4 Projects: fix punctuation of messages
Change-Id: I94ccfab2dbd689a9f9e8194c2647e2fe92620c49
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-07 16:09:47 +01:00
Daniel Teske
9b998d4206 QtVersionDialog: Tweak column resizing behavior
Task-number: QTCREATORBUG-11382
Change-Id: I8cfb94f1abc64d0a9306dc9408edff86c39d10c5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-07 16:09:36 +01:00
Leena Miettinen
336a71fbee Android: fix capitalization and punctuation in UI text
Change-Id: I132e849264f4be6c5378ece9bbf95943d25b9f69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-07 16:09:13 +01:00