Commit Graph

53197 Commits

Author SHA1 Message Date
Nikolai Kosjar
9cb02d1663 CppEditor: Fix condition for Obj-C keyword highlighting
Change-Id: I3fb8bf46fffbb0b41ef532996a21f03d2d48a9c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-16 14:10:39 +00:00
Nikolai Kosjar
837cb2e397 CppEditor: Do not highlight C++ and Qt keywords for C
Task-number: QTCREATORBUG-2818
Task-number: QTCREATORBUG-18004
Change-Id: Ibca60a1711c827dd8b4c0486bff3d49b19a61d8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-16 14:06:04 +00:00
Friedemann Kleint
cf807253e4 QML application wizards: Add code to bail out on load errors
When something goes wrong with deployment or there is a syntax
error in the QML files, the old code would enter the main
loop not showing any windows. Worse, the binary is then locked
on Windows and cannot be overwritten. Add a clause checking
whether there are any root objects and bail out on failure.

Task-number: QTBUG-60764
Change-Id: I3620a09ec4331dc04a5194dfd2ece2ff44bdc429
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-05-16 14:04:03 +00:00
Tor Arne Vestbø
5bc796094a Allow custom handling of python Dumper warnings/exceptions
Change-Id: I04108a09c317675d597bb6d0d58331c70ce02fb9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 12:38:16 +00:00
hjk
99ac955664 Debugger: Fix display of pointers as arrays
Task-number: QTCREATORBUG-18204
Task-number: QTCREATORBUG-17803
Change-Id: I4efe359c206b53ef773127cf29107d3cce720819
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 11:55:58 +00:00
Kari Oikarinen
e763ce28e8 QmakeKitInformation: Leave new Boot2Qt Qt versions also alone
Original check was introduced in
200e7dd437, but in Boot2Qt 5.9 Qt versions
use a different id.

This lead to Emulator kits using system g++ on Linux instead of the
provided one. Possibly also other way (desktop using emulator g++).

Task-number: QTCREATORBUG-18169
Change-Id: I42f0da784ccaf749ce2eaba5d689bbdb8c11f971
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-16 10:48:51 +00:00
Eike Ziller
83b8c8fc15 Reduce CPU load of test parsing
Use a thread pool with reduced max thread count.

Task-number: QTCREATORBUG-18185
Change-Id: I18bd3de82365edaf21d8dcf9c89035da1ac74756
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 10:46:13 +00:00
Leena Miettinen
2dd48a2080 Doc: Update and reorganize Android development requirements
Change-Id: I61dec28ca16b4f4849a0c8c6da8002d3f3fe2ce9
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-05-16 07:26:07 +00:00
Christian Kandeler
6754514489 QbsProjectManager: Re-introduce install step
... in a modified variant. The install root is now taken from the build
step to ensure consistency.
A dedicated deploy step can be useful on Windows if one wants to rebuild
while the application is running.

Task-number: QTCREATORBUG-17958
Change-Id: I93bc59b0e6d954d61d84bcfc81576cdb4fac1216
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-16 07:19:22 +00:00
hjk
4dac9c40bb Valgrind: Announce 'started', not 'stopped' on startup
Also provide a name for the workers.

Change-Id: I323c498db1eeb8225170aae080fdf084aa53e14a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 06:03:05 +00:00
Thomas Hartmann
567a99c5aa QmlDesigner: Replace SwipeView with StackLayout
In the designer we replace a SwipeView with a StackLayout.
Form the perspektive of the designer they are the same
and StackLayout is easier to handle.

Change-Id: I308ec209024e22db9f56e363e27588a40283603c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-15 15:50:48 +00:00
Christian Kandeler
b9b3717007 RemoteLinux: Fix creation of environment aspect widget
This was forgotten in ae9fff17a1.

Task-number: QTCREATORBUG-18167
Change-Id: Ib1e3d06ee822dff6b991d967b2f68148cc9c55c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-15 14:40:54 +00:00
hjk
89f02cba2c ProjectExplorer: Split Target and ToolRunners into smaller tasks
This increases re-usability of activities like 'port gathering',
and makes their use less dependent on actual device implementations.

Change-Id: I017cb74874f2b38c487ba2d03906a675d5618647
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-15 14:35:03 +00:00
Orgad Shaneh
f19de84e57 VCS: Quote command-line arguments
Change-Id: I49e776abe769b70d8003483215a4dbe31f60377b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 14:06:03 +00:00
Eike Ziller
964dd4a3e1 Add a way to redirect the "install settings"
If the default install settings contain a value for
"Settings/InstallSettings", then that is used as the actual path for the
actual install settings instead.

If the path is relative, it is interpreted as relative to Qt Creator's
applicationDirPath.

Change-Id: I212037112e88c60c94239580841aa1400d96fb73
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-05-15 13:47:37 +00:00
Eike Ziller
9b93d5a330 Merge "Merge remote-tracking branch 'origin/4.3'" 2017-05-15 13:32:48 +00:00
Eike Ziller
64b19af7dd Merge remote-tracking branch 'origin/4.3'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
2017-05-15 15:31:55 +02:00
Daniel Teske
c7c61ce633 KeyWordsCompletion: Simplify code
Make the perform method stand alone by removing various members of the
class
and inlining various functions.

Change-Id: I57cc561f011aa813fbf548837ef0834fdb517118
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:31:40 +00:00
Orgad Shaneh
02d2b36ce7 Gerrit: Avoid UTF-8 in comments
When the default charset is not UTF-8, the editor fails to open this
file for write.

Change-Id: Idda8379e10ac48e3a5c1012a1c6b7b06ef5835e5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:27:28 +00:00
Orgad Shaneh
689aa3891d CMake: Ignore dirty signal on server-mode on Windows
CMake sends false signals on Windows. Until this is fixed, ignore them.

Task-number: QTCREATORBUG-17944
Change-Id: If59f04fd68a899069ecc02df592d3105e531f5bb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:23:30 +00:00
Alessandro Portale
36c8227caf App: (Re-)enable automatic HighDPI scaling for Linux
The original reason for disabling HighDPI scaling on Linux in
7da2b4a3cb was unhinted fonts for non-
scaled scenario: QTBUG-46435. That issue had been fixed long ago:
0f7bc885aa7ae8cc3c448cc751aba4eba8c1c8b8

HighDPI support on Linux should by now be good enough to give it another
try by default.

Change-Id: I5b74f46310254c2916a2f16a7655d9f096453cc3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-15 12:08:35 +00:00
Nikolai Kosjar
c9a9aadde7 QmlDesigner: Remove unused acceptedModelNodeChildren()
Change-Id: I3f584e94135852a1a3619fc2ebb877897a7eef60
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-15 11:23:15 +00:00
Orgad Shaneh
7e8bac1512 Gerrit: Terminate previous query when remote is changed
Change-Id: Ifafaa9068dca069562973151361e653f6db3617e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 08:19:59 +00:00
Christian Kandeler
4b38b09a81 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: Icebf0374b92612b7823d9e21b489205a94e34cc2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-15 07:42:55 +00:00
Kevin Funk
65234d3614 Fix crash when attaching GammaRay to running proc
Backtrace (excerpt):
```
Thread 1 "qtcreator" received signal SIGSEGV, Segmentation fault.
0  0x00007fffe2a809d0 in ProjectExplorer::Runnable::Runnable (this=0x7fffffffc5c0, other=...) at /home/kfunk/devel/src/qt-creator-4.3/src/plugins/projectexplorer/runconfiguration.h:175
1  0x00007fffe2a81eab in QPair<ProjectExplorer::Runnable, Utils::ProcessHandle>::QPair (this=0x7fffffffc5c0, t1=..., t2=...) at ../../../../qt5.8/qtbase/include/QtCore/../../../../../src/qt5.8/qtbase/src/corelib/tools/qpair.h:61
2  0x00007fffe2a81f04 in qMakePair<ProjectExplorer::Runnable, Utils::ProcessHandle> (x=..., y=...) at ../../../../qt5.8/qtbase/include/QtCore/../../../../../src/qt5.8/qtbase/src/corelib/tools/qpair.h:151
3  0x00007fffe2a6e74a in ProjectExplorer::ProjectExplorerPlugin::runningRunControlProcesses () at /home/kfunk/devel/src/qt-creator-4.3/src/plugins/projectexplorer/projectexplorer.cpp:2568
4  0x00007fffdfcfef4e in GammaRayIntegration::Internal::ProcessTrackerBackendQtCreator::checkProcess (this=0x555556240c10, pid=6881) at ../../../src/qtauto/kdab-plugin-gammaray-qtas1.2/gammarayprocesstrackerbackendqtc.cpp:112
5  0x00007fffdf943b6a in GammaRay::ProcessTracker::D::requestUpdate (this=0x555556230800) at /home/kfunk/devel/src/qtauto/gammaray-qtas1.2/common/processtracker.cpp:72
6  0x00007fffdf943548 in GammaRay::ProcessTracker::D::qt_static_metacall (_o=0x555556230800, _c=QMetaObject::InvokeMetaMethod, _id=0, _a=0x7fffffffc800) at common/processtracker.moc:77
7  0x00007ffff66cf95a in QMetaObject::activate (sender=0x555556230900, signalOffset=3, local_signal_index=0, argv=0x0) at /home/kfunk/devel/src/qt5.8/qtbase/src/corelib/kernel/qobject.cpp:3743

(gdb) frame 0
0  0x00007fffe2a809d0 in ProjectExplorer::Runnable::Runnable (this=0x7fffffffc5c0, other=...) at /home/kfunk/devel/src/qt-creator-4.3/src/plugins/projectexplorer/runconfiguration.h:175
(gdb) p other.d
8 = std::unique_ptr<ProjectExplorer::Runnable::Concept> containing 0x0
```

Fixed both locations where there's a potential nullptr derefence in this
file.

Change-Id: I23f7db6f18675470b19cdf39dce449c5b694160d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-05-12 14:52:22 +00:00
Tobias Hunger
3e8e82b2e3 Wizards: Fix wizards in KDE environments
KDE checks for a "text" property in the wizard pages and will then replace the
text it sees there with some text with added '&' characters. This breaks the
wizards, so rename the properties to something that is not "text".

Task-number: QTCREATORBUG-17503
Change-Id: Ie513848cef9cd795f06a47659abb550abd268b11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 13:34:37 +00:00
Nikolai Kosjar
3c02b9b968 C++: Fix invalid read in isQtReservedWord()
The change

    CPlusPlus: Fix isQtReservedWord
    commit 7d76dd0079

enabled the problematic code path.

Change-Id: Ic89e3976b07ad55976c474f9c4b6d6f6cf64d29e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-12 13:18:46 +00:00
Tobias Hunger
112254dc67 CMake: Improve detection of build directory in server-mode
Detect both build directories next to the sources as well as below the source
directory properly. Without this patch all files that normally go into "Build
Directory" node were listed below "Source Directory" when the build directory
was a child of the source directory.

Task-number: QTCREATORBUG-18196
Change-Id: Ib8674489cfe04958f76df24904107bb7aa093162
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 13:15:32 +00:00
Oswald Buddenhagen
d0f3f7f7e5 remove executable permission from .ts file
Change-Id: Ie5817708c942523721421a4c1c9d553ec1bf2be0
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-05-12 12:44:48 +00:00
hjk
69521da36e Debugger: Fix crash on second options opening
Change-Id: I6ca5d860e9c2a82e7032873a0a2c939ab2f4c69f
Task-number: QTCREATORBUG-18189
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-12 12:41:21 +00:00
Robert Loehning
47198b44e4 Squish: Exclude HTML when reading version from dialog
Change-Id: I2e73a27aaa3b8c28cdce93576a8cdfc861e37b8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-12 11:30:14 +00:00
Tobias Hunger
4e6fd0a2c0 CMake: Improve handling of CMAKE_RUNTIME_OUTPUT_DIRECTORY
Set the working directory of binaries which got moved from the
build directory using CMAKE_RUNTIME_OUTPUT_DIRECTORY to the directory
the binay is actualy in.

Task-number: QTCREATORBUG-18158
Change-Id: I059d55a6c408799f3220bd90c271a6d743e6cd82
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 11:17:47 +00:00
Tobias Hunger
5f03b47f36 Qmake: Hide dummy.cpp files in unconfigured projects, too
Change-Id: I6580377c1a43996eb6d7737a095de29112840c26
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-12 11:07:03 +00:00
Tobias Hunger
18537a5594 ProjectNodes: Sprinkle QTC_ASSERT over code looking at parentFolderNode
Not checking the parentFolderNode triggered a crash elsewhere already, so
double check other uses of parentFolderNode and use QTC_ASSERT to make sure
no nullptr is going to be accessed.

This is necessary now that we have a forest of project trees and no longer
have a sessionnode anymore.

Change-Id: Ibc380c2ec9b12b983e709d2eeb03a8b741fe1058
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 10:33:15 +00:00
Nikolai Kosjar
e788333510 Clang: Add -Wno-used-but-marked-unused
...to built-in diagnostic configuration "Warnings for almost
everything".

Change-Id: I2a70c76c5b876cc0dc8cebd80c2457550b608593
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 10:13:55 +00:00
Thomas Hartmann
2e5d91d9de QmlDesigner: Fix function name
Change-Id: Ie32583be28bca622c668de7a89a206aeca745683
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:12:02 +00:00
Thomas Hartmann
39d32e7dba QmlDesigner: Some cleanup
Change-Id: Id54ceb09ada16ef41ebd568f5e8fe0559cc52e76
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:11:54 +00:00
Thomas Hartmann
00e9b99161 QmlDesigner: Introduce NavigatorModelInterface
We use NavigatorModelInterface to encapsulate different models.

Change-Id: Ia7bcdfffea18942cb07ca3495e078a97ca51d97c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-05-12 08:11:47 +00:00
Thomas Hartmann
967f4d4271 QmlDesigner: Add missing override
Change-Id: I949a5e96c0a0ac0e2b88860c191095543de417f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:08:36 +00:00
Thomas Hartmann
18e758eac0 QmlDesigner: Use the model Role to retrieve ModelNodes
We have to avoid to use the model directly, since
we will have two different models in the future.

Change-Id: I3bffc897c2c15bdd37da42df701a0e6995ba6c6f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:08:29 +00:00
Thomas Hartmann
33c6ffc6ee QmlDesigner: Remove dead code from NavigatorTreeModel
This code has been moved to the delegates.

Change-Id: I3e44a3eb2038299d3b0a7de1e86ed92c3d835bd4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:08:21 +00:00
Thomas Hartmann
8f0c5397e6 QmlDesigner: Remove NavigatorTreeModel from NameItemDelegate
NameItemDelegate does not require internals of the model anymore.
The delegates are now agnostic about the model.

Change-Id: Ibf19674b765353f1f55a361a76ab4002534b73b6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:08:14 +00:00
Thomas Hartmann
9c4ea2c457 QmlDesigner: Remove NavigatorTreeModel from IconCheckboxItemDelegate
IconCheckboxItemDelegate does not require internals of the model anymore.

Change-Id: Ia4d2787cf34c56e8b2a3b82184b9d5f2378ce607
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 08:08:07 +00:00
Orgad Shaneh
f603a115d0 Dumper: Put object address for pointer also when it is not dereferenced
int main()
{
    int foo = 42;
    void *bar = &foo; // bar has no object address
    return 0;
}

Change-Id: I917c2976bd618c096bfd704abff8b3538e38a0d3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-12 08:04:21 +00:00
Thomas Hartmann
14d4ebd312 QmlDesigner: Decouple NameItemDelegate from model
We introduce a role for the model node.
This way we do not have to access the model directly.

Change-Id: If3eb006894e1d227ec9c58bbd99cdcd500cd62d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:59 +00:00
Thomas Hartmann
4fe63ed702 QmlDesigner: Remove unused code
Change-Id: Id35a743377d77882c7fc5e33e2a69a01c0fde140
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:51 +00:00
Thomas Hartmann
31142bdf86 QmlDesigner: Remove unused code
Change-Id: I5c74437bf2ba9dad06b452c58286a5168e6f392e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:43 +00:00
Thomas Hartmann
6e8e660f3c QmlDesigner: Some cleanup
This was just some reference/leftover. It is now used
in the WIP implementation of the new/alternate model.

Change-Id: I2909f3b7c24121277b1b05b03716d0a2dbdbcd73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:35 +00:00
Thomas Hartmann
7a9f3d9d76 QmlDesigner: Do not paint icons for property rows
Change-Id: I8abd54b20371ffaec37c044e8cdefe4010c520dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:26 +00:00
Thomas Hartmann
790f17573d QmlDesigner: Handle missing icons
In the complex model we will not always have icons.
We keep 4 pixels for indentation.

Change-Id: I07b66d3846a36a73a2dcbe4910f2da895756ef07
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-12 07:57:11 +00:00