Commit Graph

31174 Commits

Author SHA1 Message Date
Aurindam Jana
253a8522bb QmlProfiler: Add members for QML port and host
Change-Id: If454497b87d84ce0f998edf7a99783ec833f352c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-25 09:28:24 +02:00
Petar Perisin
5478cf3c78 Git - bugFix in submoduleList
it looks like submodule list in git config does not return paths. that
is why I have direct reading of .gitmodules file now.

Change-Id: I7f441d0b2e31ad7b73fbc8c05e5c9a9e0c84036c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-24 20:18:12 +02:00
Marco Bubke
893020ae5d QmlDesigner: We should test if untracked items are dirty too
Change-Id: I94db08fff3e7e38a9cc377d06a5aabc6d886b64e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:46:01 +02:00
Marco Bubke
cec82a13e1 QmlDesigner: Fix clipping render bug
Clipping is happen over the bounding rectangle, so should provide the
clipped bounding rectangle.

Change-Id: I602da312a7ca327def378a887a75782c61cc680d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:52 +02:00
Marco Bubke
ea5169a163 QmlDesigner: Improve naming of variables
Change-Id: I8429517b81308f4a6a15b90a1ac7486de49562d9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:44 +02:00
jkobus
895b89dbdf Fix a crash on changing context lines with block selection
Crash occurs in diff editor when there is a block selection
and you are changing context lines number.

This workarounds the crash, but it seems that
when BaseTextEditorWidget has a blockSelection
calling "clear()" and "setPlainText()"
causes the crash. When I turn off the
blockSelection before calling "clear()" it helps.

Change-Id: I0133862a2d7e2914c16368b7efa9986b4d56ff39
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-24 15:31:32 +02:00
Fawzi Mohamed
482d43e3f6 consoleprocess: improve error message
Change-Id: I463b5efc9619e0a32221f3059672aa48b2b6ad8b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-04-24 15:14:22 +02:00
hluk
ecc3c9f0a3 FakeVim: Perform undo/redo at least once
Change-Id: I289cb48cab47f4b0462f00ac490c66607a40dba2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-24 15:07:49 +02:00
Christian Stenger
ba6cc1d04f Squish: Cleanup workarounds.py
Change-Id: Ibbdae1c85d49122928fda97ea5f3d83245eab7ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-24 13:20:41 +02:00
jkobus
ce0efbda46 Omit separator lines when copying selected text
In addition rename int start -> startPosition and int end -> endPosition
to avoid a name clash with QTextBlock start inside
BaseTextEditorWidget::createMimeDataFromSelection().

Change-Id: I7f54e4046913b5d5d9ddd3c07fd2747b4ca6f3fb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-24 13:17:53 +02:00
Marco Bubke
a58810ce9e QmlDesigner: Do componentComplete for QObjects with QmlParserStatus
Change-Id: If7ea6c55f4540a8bde113076288c0e9c6dd1210f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 12:45:35 +02:00
Aurindam Jana
f512deb52a DebuggerAspect: Show both Cpp and QML debug check boxes
Change-Id: Ice552b9ed78ee7fdc9950b78d042f0f6a59d2657
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-24 12:31:31 +02:00
Kai Koehne
16fd2cbb93 MinGW: Fix warning about _WIN32_WINNT being redefined
Change-Id: Ia097316b1eb16fbb0868f8b3f42e0ad5892f4573
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-24 12:17:44 +02:00
Friedemann Kleint
2e2f334349 Fix tr-context in quickfix.
Change-Id: Idf741c0eb77dad6f2893f4dff45a8455d3ce9289
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-24 11:49:40 +02:00
Andreas Holzammer
bd4105def7 QNX: Enable QML debugging for pure QNX devices
This includes fixing the application arguments when launching
the application through gdb. As the application is launched by
passing it as an argument to -exec-run (or run), the application arguments
needs to go in the same command. -exec-run won't care about
arguments set with -exec-arguments when being passed the application
binary.

Change-Id: I869acbedd2593a931bf5c3d88559ea2bda2c3ff1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-24 10:44:44 +02:00
hluk
2a8a411b21 FakeVim: Fixes and more tests for visual block mode
Task-number: QTCREATORBUG-9190
Change-Id: I4cc3ef675f65edafc1d68ae9dd1521656b5bfdb7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-24 10:16:50 +02:00
hjk
ed890bc940 Debugger: Move dockwidget object names into a more private place
Change-Id: I5a3565179fdd8627387ba01370e6484d668e2160
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:36:36 +02:00
hjk
3aecfc4c41 Debugger: Don't discard newlines unconditionally in LLDB output
Change-Id: I9aedbf52f191073b6aceb0fda261b0c0dc4630f3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:45 +02:00
hjk
ff6296f3cb Debugger: Improve internal dumpers for GdbMi and BreakpointId
Change-Id: I26d20a1e592254c09e865528b2fa31cc20bcae54
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:33 +02:00
hjk
2cb48a1431 Debugger: List installed dumpers properly in LLDB bridge
Change-Id: Id38cf5e8664b7584886d14be9a090bc7b7172410
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:21 +02:00
Daniel Teske
d0dc68058e ProjectModels: Fix crash on changing the tree in particular ways
The crash is due to the project model figuring out a safe node to be the
current node, setting that. But then the DocumentManager synchronizes
the current node with the editor, thus setting the current node back.

Task-number: QTCREATORBUG-9176
Change-Id: Ia516a770dbbfd16d224fa030a8c3d1b3a40f83cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-23 17:04:15 +02:00
Christian Stenger
eab228dcca Squish: Cleanup workarounds.py
* removed fetching status
* improved output for closed bugs

Change-Id: Ice0256f75571c6c44e9878447d3821247f5ded4f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 17:04:07 +02:00
jkobus
5219faf0e2 Refactor code
Create a common method for a similar code.
Simplify some logical operations.

Change-Id: If25703c51ea96fe5a64698f6fa3ffd6f5cb1b2c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-23 16:35:22 +02:00
Christian Stenger
59edc40593 Squish: Add Run button to objects.map
Change-Id: I506a030714a46a1ca3610b18daf296deaa6bfcc2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 16:11:37 +02:00
Christian Stenger
c4aad3ef79 Squish: Cleanup tst_simple_debug
Change-Id: Ie74b0dd42d14e594e436408e39db20554904b84e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 16:11:28 +02:00
Christian Stenger
1f5b3ed670 Squish: Cleanup tst_simple_analyze
* workingDir should not be global
* handle missing Qt Creator plugins on startup

Change-Id: Ibb8267da9d3443104f6d895ff98b6047f693284e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 16:11:16 +02:00
jkobus
5f5b7fa4c1 Remove unused variables
Remove unused fields and one virtual method,
rename alwaysShows -> contextChunk and revert
its logical value.

Change-Id: I11fd60202aa5b7978b772764a40c99029cac82a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-23 14:33:33 +02:00
Daniel Teske
3ab78b3459 Qt4ProjectManager: .QML are not qml files
Task-number: QTCREATORBUG-9191

Change-Id: I989f295ed037e92be692c52fd3f8a2c322819e12
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-23 13:22:35 +02:00
Nikolai Kosjar
849534ec6f Revert "C++: fix support for typedef of templated typedefs"
Still crashes when opening the Qt Creator project,
g++ (Ubuntu/Linaro 4.7.2-2ubuntu1) 4.7.2 (Ubuntu 12.10).

This reverts commit 564c9b2842.

Change-Id: Ief5c0aad463d245f68805f747d277ac298796c3d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-23 12:36:06 +02:00
Aurindam Jana
e8c23e1d71 Android: Setup QML debugging
Change-Id: Ida96411f9710bd9a968d4b934fb50f69bf3666fc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-23 12:06:29 +02:00
Joerg Bornemann
714298b370 fix build with namespaced Qt
Change-Id: I014b751d0e7bf584c2370c8ae40fbe91f28ff747
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-23 11:32:26 +02:00
Sergey Shambir
20b5c3b2c8 ToolChain: added warningFlags() method
Converts toolchain-specific flags in QFlags.
Will be useful for ClangCodeModel.

Change-Id: I2cff650c952f7c41d3a27535a27fa52b932a0b92
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-23 11:23:41 +02:00
Daniel Teske
e0314eb4f3 TargetInformation: The coding style disallows structs
So make this struct a class

Change-Id: Idb4366c6c1130bc318df896c45a9f878f29eb133
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-23 11:21:34 +02:00
Daniel Teske
d3337ea23a Qt Quick Wizard: Fix text in wizard description
Change-Id: I9f8b110e3d88fa3e9fc02a1c82e8bad0bf670d8b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-23 11:21:02 +02:00
Eike Ziller
8e1123cdde Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2013-04-23 11:16:15 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
jkobus
ed1bbafad9 Fix typo inside comment
Change-Id: Ida0d5489b0c4890afd625be405a2fabdb6bc6748
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 11:01:19 +02:00
Tobias Nätterlund
874328fe9b QNX: Corrected path to qml files for pure QNX devices
For pure QNX (non-BlackBerry) devices, the path to the QML
files are decided by the user. Only adjust the path for BlackBerry
devices.

Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
2013-04-23 10:38:19 +02:00
Kai Koehne
c4be740bd6 README: Update section about private headers
It's not only QmlDesigner that nowadays uses private API.

Change-Id: I87ea88e780b3a8d7169d4c75e84dc4e78dd7cab7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-23 09:59:27 +02:00
Leena Miettinen
48687fd8a1 Doc: fix changed field labels
Change-Id: I2a9fa92f80c51c088d855f5fec57aecacbb4bea2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-23 09:47:09 +02:00
Tobias Nätterlund
53fb29bdda QtQuick2ApplicationViewer: properly resolve install paths
This is a port of commit 2982545d to also apply it to
the qtquick2applicationviewer.cpp template.

Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 09:19:46 +02:00
Eike Ziller
dbef8d21af Fix "open link in other split"
I.e. ctrl+alt+click in the code editor.

Broke with 6a4310a44a

Change-Id: I63e8f61f8d6f082773eaf70e427d706000b4d01d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-23 08:00:07 +02:00
Thomas Hartmann
fd9d39c12a QmlDesigner.Instances: properly disable component complete for 5.1
This is only available in Qt 5.1

Change-Id: I76b7916b4ce64c440c175e77edc2b0a3ef015166
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 18:19:24 +02:00
Marco Bubke
457566974d QmlDesigner.Instances: adding LayoutNodeInstance
This class wraps a QQuickLayout.

Change-Id: Ib661ccb5bb5deb1acb87b9a4bef8da95cb4e40eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:39:04 +02:00
Marco Bubke
ff4457bb46 QmlDesigner: Prepare for other layout items
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:37 +02:00
Marco Bubke
40b62e1cfa QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:23 +02:00
Eike Ziller
e3fd25256d Qbs build files: Install files to correct location
First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-22 16:58:09 +02:00
Christian Stenger
a50f4073c8 Squish: Improved QmlProfiler test
Change-Id: I2ad50fac22a02de79643eb4d8a06c8736bb8539c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-22 14:12:16 +02:00
Daniel Teske
ca2c9b5c9c Qt4Project: Fix double restoreSettings on opening project
Task-number: QTCREATORBUG-9151

Change-Id: I9100fbb34eead6d5ef32e7cd0859ce6ed6ea6f78
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-22 13:55:45 +02:00
Thomas Hartmann
7076272bf5 QmlDesigner.Instances: fix delemiting of type names
Import are delemited with a "." and there is a "/" between
import and type.

e.g.: QtQuick.Layout/QQuickLayout

Change-Id: I7750b333296cceef99992610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 13:21:32 +02:00