Commit Graph

41387 Commits

Author SHA1 Message Date
Nikita Baryshnikov
b46cf9aaf5 Coding style: update advice
to do not use unique_ptr instead of auto_ptr which was deprecated

Change-Id: If6e5bd25c62184a5d34c0cdedf0206138e32bf28
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-27 10:49:12 +00:00
hjk
cf1c8a06aa ProjectExplorer: Fix connection lifetime in WorkingDirectory aspect
Also add some sanity checks before accessing related pointers.

Change-Id: Ic9576ad3b28333210adc1187d4a0a26d52b0538e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-27 09:58:43 +00:00
Orgad Shaneh
4aa5116694 Git: Re-disable timeout for interactive rebase
Broken by be3e0438c6.

Change-Id: I2d22a47b764940e9c36847f2c6ea6c8e29cb29de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 09:55:05 +00:00
Tobias Hunger
0b44b6e709 WizardFactory: Trigger scan for wizards early
Trigger scan for wizards in delayedInitialize since we need to
create commands for the wizards. Also make sure wizards are
scanned for when opening the options page, so that the keyboard
shortcut page can be fully populated.

Change-Id: Iefe28dbcb17f43a7ed114f056012fe8f6e4ae352
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-27 09:53:28 +00:00
Tobias Hunger
d04d63d8d4 Wizards: Add a command to trigger a reload of all wizards
This will make the custom and the json wizard scan for their files
the next time all wizards are requested.

Change-Id: Ibe1ed3f838d1c177e9bbf91ed0eae49028f671cd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-27 09:53:22 +00:00
Tobias Hunger
cbc0959e0c Wizards: Register commands for wizards
Change-Id: Ida28b91c97980cb1391ddad7291151b4e8615615
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-27 09:53:18 +00:00
Jack Andersen
39df03aba7 Debugger: LLDB strictly requires bool values for breakpoint API
Change-Id: Ia4b3cfb2ef41df8c76800eb4da597f7cb5f770c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-27 09:04:50 +00:00
Orgad Shaneh
588b333669 CppTools: Highlight type for templated using
Task-number: QTCREATORBUG-9944
Change-Id: I614571e05039f24b7d56abdddc15f912581f68f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-27 08:29:36 +00:00
Orgad Shaneh
d004b1b616 CppTools: Fix test_cppsourceprocessor_macroUses on Windows
It assumes LF line-endings

Change-Id: I7bfeb4b6d4db2fd6457030e2d21c240534de9cd2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-27 08:29:22 +00:00
Christian Stenger
bc18b4e136 Designer: Fix compile for gcc 4.7.3
Introduced with 25f2f8e1ee

Change-Id: Ic84fa409bea0aec7db4dce66d468f80c845a3673
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-27 05:39:14 +00:00
Nikita Baryshnikov
e325a74098 ProjectExplorer.BuildInfo: deinline dtor.
Similar to 184695be92

Change-Id: Ifd78300fc5c8eb1d53601b50a4a4fa43d5b8afa4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-26 19:15:26 +00:00
Nikita Baryshnikov
ea2bea591e ProjectExplorer.Task: initialize movedLine member
Change-Id: I71527dc9da9e9d0e06e7e180734ef577dbdbb195
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-26 16:09:26 +00:00
Nikita Baryshnikov
c12517715d JsonWizardPageFactory: deinline dtor
It saves 2 copies. Similar to 184695be92

Change-Id: I2a70e4a570af54fd0be5bb6bc198cff4f5e91317
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-26 14:46:38 +00:00
Daniel Teske
89b3d2f22c Android: Add a activity line edit to the AndroidManifest editor
And remove code for handling @strings/app_name. The default template
hasn't used that for a while and it's pretty hard to properly support
that with both a activity and app setting.

Change-Id: I394b78e0a5380232efbc52e1c71d49d9696a9b00
Task-number: QTCREATORBUG-13958
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-26 14:45:32 +00:00
Nikita Baryshnikov
5697a93549 VcsBaseOptionsPage: add dtor
saves 7 copies. Similar to 184695be92

Change-Id: Iebe5e14f07d77bc98fd5b5bff7e315ccd8c1fab4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-26 14:38:02 +00:00
Eike Ziller
3858c33d74 Merge remote-tracking branch 'origin/3.4'
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
2015-05-26 15:12:42 +02:00
Eike Ziller
03b92050e0 EditorManager: Fix path separator in error messages.
For recently introduced code.

Change-Id: Ie6e5333990526bd912e773493241975cded009d2
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-26 12:47:24 +00:00
Ulf Hermann
b8038191e6 Timeline: Emit heightChanged() when empty changes
The height of a model is 0 if the model is empty. Thus, when clearing
we have to emit heightChanged().

Change-Id: I6f05c2a32cff648d6aa8e623e17aebe9ae4fcb5c
Task-number: QTCREATORBUG-14507
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-26 12:21:51 +00:00
Tobias Hunger
fd64aeed3e JsonWizard: Mark class-kinds as deprecated in warning.
Change-Id: I381c43fb85b552fef3a07910954482a45cbff5c0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-26 12:02:41 +00:00
Tobias Hunger
25f2f8e1ee IWizardFactory: Create wizards with factoryCreators
Do not use the object pool to hold potential wizards. Register
FactoryCreator functions with IWizardFactory instead and use
those to create the wizards when necessary.

This saves us a couple of cycles during startup since we can now
delay construction of all wizards and it makes us more flexible
wrt. managing the lifecycle of the wizard factories.

Change-Id: I95d6a6dfcdf0fd995e1934a9fefcd96c6a676753
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 11:47:53 +00:00
Tobias Hunger
b5e3f2e57b CustomWizard: Remove example wizards
We do not want to encourage the use of custom wizards, so
remove the examples. The Json wizard has already enough
real-world examples IMHO.

Change-Id: Ic755e01ce0430b90ad4d5ea3496c11ce162249bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-26 11:24:56 +00:00
Nikita Baryshnikov
184695be92 ProjectExplorer: export NodesVisitor
and deinline dtor. It saves 2 copies

cd /io/qt/qt-creator-build/lib/qtcreator/plugins &&
nm -C ./*.so | grep vtable | grep -v " U " | cut -c 18- | sort | uniq -c
| grep -v " 1 "

      3 d vtable for ProjectExplorer::NodesVisitor
      5 d vtable for QFutureInterface<bool>
      2 d vtable for QFutureInterface<Core::LocatorFilterEntry>
      2 d vtable for QFutureInterface<TextEditor::HighlightingResult>
     18 d vtable for QFutureInterface<void>
      2 d vtable for QFutureWatcher<TextEditor::HighlightingResult>
      5 d vtable for QFutureWatcher<void>
      2 d vtable for QmlDesigner::(anonymous namespace)::TreeViewStyle
     14 d vtable for QRunnable
      3 d vtable for QtConcurrent::RunFunctionTaskBase<void>
      3 d vtable for QtConcurrent::RunFunctionTask<void>
      2 d vtable for RemoteLinux::Internal::(anonymous
namespace)::ConfigWidget
      2 d vtable for Utils::View<QListView>
     11 d vtable for Utils::View<QTreeView>
      2 V vtable for Core::BaseFileFilter::Iterator
      3 V vtable for CPlusPlus::SymbolVisitor
      3 V vtable for CppTools::CppRefactoringChanges
      5 V vtable for ProjectExplorer::BuildInfo
      3 V vtable for ProjectExplorer::JsonWizardPageFactory
      2 V vtable for QmlJS::SimpleAbstractStreamReader
      2 V vtable for QmlJSTools::QmlJSRefactoringChanges
      8 V vtable for VcsBase::VcsBaseOptionsPage

similar to QTBUG-45582

Change-Id: I75f7f5cf5522d1d093b52f4f0ee8cccdbca45cae
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-26 11:23:35 +00:00
Tobias Hunger
5a05103635 JsonWizard: Enable support for descriptive images in wizards
These images are displayed above the description in the new file/project dialog.

Change-Id: Ib218e62a40891ebc2c675c49b32b3789c42d740d
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-26 11:18:48 +00:00
Daniel Teske
9bb0292b71 MiniProjectTargetSelector: Make sure we always have a heading
Change-Id: I4ea5883e64bcae405ae00200616a1f915bdeffff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-05-26 11:15:34 +00:00
Tobias Hunger
d19c4b6b62 Doc: Update class names in wizard documentation
Change-Id: I82b136d37e6b3b9c9e74aafc105fb0291c605b55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 10:25:08 +00:00
Tobias Hunger
9c1f96d47a IWizardFactory: Remove class wizard kind
Map existing class wizards to file wizards. The separation has never
been clean anyway. Now "file" wizards create one or more files,
"project" wizards create a complete project (something that can be
opened as a project in Qt Creator).

Change-Id: I0562f26019b54a59d46814a13a0b2fa8995c3e0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 10:17:30 +00:00
Daniel Teske
f895d97b03 Android: Increase timeout for checkPasswd and checkKeystore
The timeout was "only" 4s, but apparently pretty much every
android tool randomly takes longer than 4s.

Increasing this timeout won't affect anyone for whom the
android tool returns in 1s, but makes it work for anyone
where the checking takes longer.

This waiting though is done in the main thread, which is pretty
bad. Moving it to a background thread isn't easy though.

Change-Id: I135b1d1ee9634005d5eb6038a46d66b6a8e97fca
Task-number: QTCREATORBUG-13175
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-26 10:09:48 +00:00
BogDan Vatra
a88636bd51 Make sure we pull the right app_process from device.
On arm64 devices /system/bin/app_process is a symlink to /system/bin/
app_process64, the problem is that we are pulling it also for 32bit
apps, which will make the debugging impossible because arm-linux-
androideabi-gdb 32bit can't mix the architectures.

Change-Id: I37e071456fb89051b0433ee2e7635085257616ea
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-26 09:29:45 +00:00
Christian Stenger
e034b244c4 Core: Fix compile with MSVC 2010
Introduced with 66f603628b

Change-Id: Ifd114e7360bd5ee729d29a0f03116458d56c2afa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-26 06:45:03 +00:00
Eike Ziller
a34736f330 QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn't
Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
2015-05-26 06:13:15 +00:00
Orgad Shaneh
6d67f9429e Theme: Remove InvalidColor
It's not defined anyway. Use ProjectExplorer_TaskWarn_TextMarkColor as
default text mark color.

Change-Id: I1c7f76f0a6dc83338798cdd7450e1468e8ce39a7
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-25 08:56:47 +00:00
Tobias Hunger
34008650df Wizards: Make sure wizard ids are unique
Replace existing wizards with new ones of the same id.

Change-Id: Ia17e6a4df5e7c8b647eccbe3bfb13e1c5b2d09e0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-22 15:54:11 +00:00
Friedemann Kleint
8f39e05e40 Adapt MSVC output parser to MSVC 2015.
The space character after the line number was removed from
the compiler messages.

Change-Id: Ia249a6d4416744c67aada2eb2c5c26cf87bd7ef7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-22 15:26:36 +00:00
Eike Ziller
66f603628b Items were removed from QML overview when dragging onto editor view
Change-Id: I6e8b3cbedb78df08066f87d4aa9922145cfa151c
Task-number: QTCREATORBUG-14496
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-22 13:56:44 +00:00
Christian Kandeler
7bdcc09c63 Fix qbs build.
Change-Id: Iba2995ff3522455450ef52a72209da0dfc648d6e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-22 13:44:21 +00:00
Friedemann Kleint
31c65456cc msvc2tasks.pl: Adapt to MSVC2015.
The format of the compiler warnings changed:
c:\foo.cpp(395) : warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
c:\foo.cpp(395): warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)

Change-Id: Iaa04d8fedbb0a3da2802be1c860d54fefb7bfe5d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-22 10:23:24 +00:00
Orgad Shaneh
0cfd570cdd C++: Deduplicate template arguments substitution
Change-Id: I2df85493d156a214b2e7650acc77efe099d03277
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-22 09:26:02 +00:00
Orgad Shaneh
4eb9b5f145 C++: Simplify template function resolving a bit
There's no reason to keep the Template after it is instantiated.

Change-Id: I91210ae11b3420bb038168fe951b52d28ccc132e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-22 09:13:00 +00:00
Orgad Shaneh
b5f6a9e6e5 C++: Fix decltype resolving for nested instantiated class
The enclosingScope of a cloned nested class is not the
original class but the cloned parent.

Use-case:
template <typename T>
struct Temp
{
    struct Nested
    {
        static T f();
        typedef decltype(f()) type;
    };
};

struct Foo { int bar; };

void fun()
{
    Temp<Foo>::Nested::type s;
    s.bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14483
Change-Id: I3e15399a78a7492f740db8d0c7d5c84adf77d1d0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-22 08:40:11 +00:00
Orgad Shaneh
04c4043e13 C++: Minor optimization
Avoid double map lookup

Change-Id: I5fe6b4a13829275f5a68f794cb820b488f4a5c8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-22 08:08:04 +00:00
hjk
36f83ba99a Debugger: Cosmetics
Remove one unused function declaration and adjust one comment
to reality.

Change-Id: I0ba88dfa89d1fe312cef97a659715c664f4650bc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-22 07:09:20 +00:00
Orgad Shaneh
20e279b291 Revert "Cdbext: Fix compile Warning"
It triggered another warning for comparing signed and unsigned.

Cast to int instead.

This reverts commit 5fd3fa917d.

Change-Id: I2d239c42da7ba5e1d1e3bc9e2e737eac6e438d9c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-05-22 06:53:58 +00:00
hjk
4dfb56bb10 Debugger: Directly tell memory agents about finishing
Change-Id: I79a718f45835a709daa37dd785ed718c3743d77e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-05-22 06:10:01 +00:00
hjk
54430ae13a Debugger: Modernize MemoryView connections.
Change-Id: I61b2f7a11bb516b4d14226cfdbbc581243659e4f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-22 06:09:35 +00:00
Orgad Shaneh
a3711ee207 Fix themes
Incomplete rename done

Change-Id: Ia792d15c3e0242f3e17479ff7bfbd9e7efa3a5ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-22 05:55:38 +00:00
David Schulz
8c1579bf64 Debugger: Use unified locals update in the cdbengine.
Change-Id: I94c8bd554e9e5ee157fd2bc80d3889558d08a8f0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-22 05:53:15 +00:00
David Schulz
0218abf1d0 Debugger: Compare files case sensitive depending on OS.
Task-number: QTCREATORBUG-14461
Change-Id: I6e63643754197e300dbc90c9208458e5d69beaf6
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-22 05:53:00 +00:00
Robert Loehning
661c68fffe Target Selector: Fall back to built-in Desktop icon
If the style doesn't offer any icons that have at least 32 pixels

Change-Id: I840d73a0b4bdee695bb68df1c3973ee419db012e
Task-number: QTCREATORBUG-12832
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 15:51:37 +00:00
Tobias Hunger
a19f9f683a IWizardFactory: Use Core::Id to identify a wizard
Change-Id: I9e1e9ce9a61d7d06a9869f309ed3089d843137a2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-21 14:29:47 +00:00
Daniel Teske
bd53d27e8b ManhattenStyle: Remove standardIconImplementation()
Couldn't find any users of it.

Change-Id: I52fed7fea8703351f66e82ea278b3935184244c9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 14:06:56 +00:00