Commit Graph

41132 Commits

Author SHA1 Message Date
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
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
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
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
Eike Ziller
1d97835a6e Fix crash when opening binary file with BinEditor plugin disabled
In that case we do not find any editor factory at all.
Broke with 15d8b6ba81

Change-Id: Icb0abb2ecd30d968d4a0d857be81b94a4fd6b1b5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 11:27:23 +00:00
Orgad Shaneh
b880ace167 C++: Minor cleanup
Save a few as* calls

Change-Id: Id2aa43a39ead7231d9e9046ad16d51c05af1ec77
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-05-21 11:09:03 +00:00
Thomas Hartmann
fa6d623dfa QmlPuppet: Remove dependency on ObjectNodeInstance in MetaInfo
MetaInfo cannot depend on ObjectNodeInstance.
I forward the QObject and the QmlEngine all the way through.
The commented code in metainfo.cpp is about defining a context
for the root item. The feature is basically unused, but we can bring
it back using a callback later.

Change-Id: I8f099b06c848e2faeaafc011ac6bd313192a64bd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:17:38 +00:00
Thomas Hartmann
c9eb75e2f8 QmlPuppet: Register callback for notifyPropertyChange
MetaObject cannot have a dependency on ObjectNodeInstance.
Instead we register a callback.

Change-Id: I9f6e096c67caf1abd525201c9bacd363d31a2fa2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:48 +00:00
Thomas Hartmann
0321f6e1a7 QmlPuppet: Clean up private API usage in ServerNodeInstance
Change-Id: Ic0890c8c6740ad2c4567b58ec9b51933d0293fc1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:40 +00:00
Thomas Hartmann
4a0a1a2b75 QmlPuppet: Clean up private API usage in QmlPropertyChangesNodeInstance
Change-Id: I007bd0a8bf5be42f0f6e9ce193a35fa8a3d3f1aa
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:33 +00:00
Thomas Hartmann
c6a2f1fe46 QmlPuppet: Explicitly include private headers
Those headers are used implcitly.

Change-Id: I49dcfb1a04b2103866b1d828605381570fb3e5c6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:23 +00:00
David Schulz
ab2a0d74de TextEditor: Sort text marks in categories.
Also adding a color for each category.

Change-Id: I3627d13913951a95804b5a816f087a822c01bd86
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 08:23:16 +00:00
David Schulz
a6e1c3cb54 Editor: Allow negative folding indent.
Fixing folding issues in the c++ editor if too many closing folding
regions were found.

Change-Id: I5c3476a6922af07be9b49d396b684a5f3b5a5e33
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 08:15:10 +00:00
Thomas Hartmann
4763acbd95 QmlPuppet: Clean up private API usage in QmlStateNodeInstance
Change-Id: If1c8cee81cbdd6f90808a824c2b4d023dd8a3e12
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:35 +00:00
Thomas Hartmann
c919795a08 QmlPuppet: Bring back simplified NodeInstanceSignalSpy
A simplified version of NodeInstanceSignalSpy is required to track
sub objects. I moved all private API usage to QmlPrivateGate.

Change-Id: I86e3e5411eb43777a6b1ab5018a1b8fb9088c666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:25 +00:00
David Schulz
7ce4958764 Editor: Correctly unset block selection when setting a new text cursor.
Change-Id: I7d155140c55ed145cede217f3cc97064161a5a07
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-21 07:29:55 +00:00
David Schulz
5fd3fa917d Cdbext: Fix compile Warning
Change-Id: Ifc2fe349f1dc287cda7bf4c5135406fe6990ef31
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-21 07:29:47 +00:00
Daniel Teske
63be3a4024 Settings be smart about scrollbars
Task-number: QTCREATORBUG-12745
Change-Id: I88a586143fc7c982df00db4aabf43e50487c2671
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:49:38 +00:00
Thomas Hartmann
a577600d12 QmlPuppet: Remove unused code
Change-Id: I1d6e136748ea8242ff0149f4612a32d71394999f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:53 +00:00
Thomas Hartmann
7415ea9563 QmlPuppet: Remove unused private header
Change-Id: I699c423c3d4a84659e074e310e8697cd19f5c4c0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:48 +00:00
Thomas Hartmann
afd903c4a4 QmlPuppet: Remove private dependencies from NodeInstanceServer
Change-Id: I386bd18704020d0b174cda224c4cf46245227877
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:43 +00:00
Thomas Hartmann
ae28d84efd QmlPuppet: Remove unused function
Change-Id: I0efdcc28cff967e931bd03eb0581dd09d29dd523
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:36 +00:00
Thomas Hartmann
6fe2c1455c QmlPuppet: Remove private dependencies from PositionerNodeInstance
Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:30 +00:00
Thomas Hartmann
0d67510270 QmlPuppet: Remove private dependencies from BehaviorNodeInstance
Change-Id: I16f2c4189f7b68bf1cff90d0a9987b4bf4212905
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:24 +00:00
Thomas Hartmann
43d716bb5a QmlPuppet: Remove private dependencies from QmlTransitionNodeInstance
Change-Id: I8a5144947469a3c7f368fa6b18781c0d07b4d850
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:17 +00:00
Thomas Hartmann
d38b1c21a2 QmlPuppet: DesignerSupport is not used directly anymore
No need to use DesignerSupport directly in ObjectNodeInstance.

Change-Id: I124adc6334feb23c30fb1a242fe95386678eadf5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:12 +00:00
Thomas Hartmann
f86eb9b78c QmlPuppet: Move functions from QuickItemNodeInstance to QmlPrivateGate
No need to use private API in QuickItemNodeInstance.

Change-Id: I5450ea41571c2787081cc88f59494a28eea5546c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:05 +00:00
Thomas Hartmann
e1a19ba229 QmlPuppet: Removing private headers from ObjectNodeInstance
Change-Id: I179de2b759307a9251c672b1747823626e2f3ef0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:00 +00:00
Thomas Hartmann
a1f70b965a QmlPuppet: Adding objectWasDeleted to QmlPrivateGate
Change-Id: I5dadc879f0c6a02ca29c35fff1847b3c7b0a0972
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:53 +00:00
Thomas Hartmann
f3abe73956 QmlPuppet: Adding keepBindingFromGettingDeleted to QmlPrivateGate
Change-Id: I51d0d29939b6fbd3fc309c092654f373abd8f179
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:48 +00:00
Thomas Hartmann
c6047e06e6 QmlPuppet: Move setPropertyBinding() to QmlPrivateGate
We cannot keep the context.
The context has to be forwarded each time.

Change-Id: I50b944bea1c6ad30832490edad8b35f392c32029
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:44 +00:00