feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

965 Commits

Author SHA1 Message Date
Alessandro Portale
b1176b97dd New Qt Creator logo 
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-10-09 15:43:28 +02:00
hjk
22a4f49153 Debugger: Require Qt 5.2 for manual test, too 
... by removing fall-back code.

Change-Id: I71f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-17 14:42:34 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
 2014-09-16 15:17:21 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES 
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-15 12:51:02 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system 
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-15 12:10:01 +02:00
Christian Kandeler
f511344ed0 SSH: Fix tunnel test. 
Since we're opening the port for IPv4, we must also use an IPv4 host
address.

Change-Id: I73e009ebd6deb0bd6804cddc8c83299dbfc1b312
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-09-11 13:19:56 +02:00
Christian Kandeler
67d18670a3 SSH: Adapt test to signal renaming. 
This was overlooked in the original patch.

Change-Id: I1709e28552ed9dd83bd3e810ba51ef5ec95d8580
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-09-11 12:52:41 +02:00
Thomas Hartmann
79c0a29dea QmlDesigner: Adding a manual test for plugin integration 
Because we had a couple of regressions in this area, I add this project
for manual testing.
In this project we have a qmlproject with a plugin that contains a .metainfo
file and a custom property sheet.

We define two items in the item library: MyComponent and MyComponent2.
While MyComponent has a custom property sheet the property sheet for
MyComponent2 is auto generated.

Change-Id: I8d5ade43f648354175587c0a3e989bad87149298
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-09 16:54:10 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks. 
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-08 10:33:25 +02:00
hjk
6431ab2c79 Use Qt 5's QStringList::join(QChar) 
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-08-25 08:21:14 +02:00
Marco Bubke
8780a5a5e0 QmlDesigner: Fix quick1 tests 
The test still used the unsupported Qt 4.7 import.

Task-number: QTCREATORBUG-12567
Change-Id: I47eee256d9e3160aea8e41537fcea92d20b42fd7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-30 14:28:20 +02:00
Nikolai Kosjar
1fe1c6d0b4 C++: Tests: Remove plain-cplusplus 
Change-Id: Ifdf4cd5ea478c87d585c9404caf8f4be6873f692
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-28 12:14:43 +02:00
hjk
776da7b5b3 Debugger: Improve associative std container display 
Handle multimap and multiset. Use the "[index] key" display that's
also used for Q{Multi,}Map both for consistency and because it's
needed to distiguish otherwise identical keys.

Change-Id: Ib9e369206bce89e5e27d1f6f60ead11ca88e2dcb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-07-22 10:47:45 +02:00
hjk
a253feee77 Debugger: Fix display of wchar_t[] 
Task-number: QTCREATORBUG-12492
Change-Id: I5668c0727a36a1529d28b36d0361922f7acb3083
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-26 14:31:47 +02:00
Erik Verbruggen
a7b882315d Mark unused fields with Q_UNUSED. 
.. to suppress -Wunused-private-field warnings.

Change-Id: I9eaea1b45bbe4fda4714831af1926c14b31cb9fe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-25 15:59:09 +02:00
Robert Loehning
ec91d3cb4c debugger: Added project for testing CLI I/O 
Change-Id: I0240ec0a258ad52a3b65ae320a8630a9711538cc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-13 16:52:43 +02:00
Robert Loehning
76f829164a debugger: Add some code for testing ctor in plugin 
Change-Id: I0c35549804befc8aed034e35c9cce24f57e41337
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-06 16:20:07 +02:00
Orgad Shaneh
2ce5b3bc0b Remove remaining PROVIDER references 
Change-Id: I0bfcd7136ec0329cfe15983278c25f6b62415b68
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-26 08:21:14 +02:00
Nikolai Kosjar
fffb3d4d58 Tests: Remove tests/manual/preprocessor 
Auto tests should be preferred.

Change-Id: I9fb81c9e0e3b0e72226a3d1193978d6fd1afa6b1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-05-23 14:41:28 +02:00
Orgad Shaneh
82aa1380f2 Cleanup whitespace 
Mostly trailing whitespace

Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-16 14:27:13 +02:00
Tobias Hunger
fe238305e5 Cplusplus: Fix Tocken::length()->Tocken::bytes() renaming fallout 
Change-Id: I6578f726abefff2ea5b4c6b3e92bf6b5b76c1a5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-15 17:16:03 +02:00
Nikolai Kosjar
126e69137a C++: Clarify units of a Token 
This will avoid confusion when later more length and indices methods are
added.

In Token:
    length() --> bytes()
    begin() --> bytesBegin()
    end() --> bytesEnd()

Change-Id: I244c69b022e239ee762b4114559e707f93ff344f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-05-15 15:55:38 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings 
Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-08 15:29:11 +02:00
Orgad Shaneh
b9f79cbd01 Clean some trailing whitespace 
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-07 16:19:47 +02:00
hjk
d2ad6aa972 Debugger: Simplify array dumper user code 
Heads up: This switches the argument order to allow a default
argument for the inner type if it can be determined from the
base pointer.

Change-Id: I9bf80fcdd51b5db8e7c65adba551ca667912cd86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-06 13:50:25 +02:00
hjk
4b4181a9cd Debugger: Handling eigen3 in manual test 
Change-Id: Id3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-10 12:19:24 +02:00
hjk
13a4f739ef Debugger: List QObject methods and signals in dumper 
This mostly re-activates code from the old code path
in the QObject dumper.

Task-number: QTCREATORBUG-11997

Change-Id: Ie3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-10 10:55:15 +02:00
hjk
161a1eb3ae Debugger: Compile fix in manual test for latest Qt base 
The #define COMMA trick doesn't work anymore after the
latest Q_DECLARE_METATYPE changes.

Change-Id: I15cfc7387d8e5329b588d6d841cd9c2322270363
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-07 10:25:17 +02:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files 
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 14:20:22 +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
hjk
21ce31a4ef Debugger: Make simple manual test work with android 
Change-Id: I33283154214a07a0232b8d52c3da62861956a9a1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-26 16:29:58 +01:00
hjk
f0d3cce9fd Debugger: Fix warnings in manual test code 
Change-Id: I1ee1cc2eb6f93c2e58e1c67d55cf3dfe82fa9f25
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-25 17:56:13 +01:00
hjk
f94249350d Debugger: Make simple manual test use C++11 also with Qt 4 
Change-Id: I6c5d891cc3b3ed1afdf12e2dc08d35e10f190c01
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
 2014-02-04 19:27:58 +01:00
hjk
2e7479aef0 Debugger: Add data extraction for dumper inferior call results. 
Change-Id: I868be727c48cb3aa570f196dadde71706df01596
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-24 16:46:51 +01:00
hjk
376f58df34 Debugger: Fix QObject/property dumper 
Change-Id: Ied68fd07e077a185223a68cc504fff5a5b9391ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-20 17:08:53 +01:00
hjk
580a8c16b9 Debugger: Disable fork test in manual test 
Change-Id: I32ec9f9bf5bdb0e9ad93b78bbb2d01dec2759a4b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-15 17:49:13 +01:00
Eike Ziller
851f255b9d Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
 2014-01-15 14:04:41 +01:00
Orgad Shaneh
ca79e4294d Fix compilation 
Unused variable

Change-Id: I190d8adf6efba8273ded2288c7232a1e77ef62f9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-08 21:42:51 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
hjk
839a383aa3 Debugger: Change default to use c++11 in manual tests 
Change-Id: Id995ee20b231dc4179eed0b03b139fdcb9ffb60a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-01-07 16:51:04 +01:00
Orgad Shaneh
f57b4d35a4 Fix compilation 
Change-Id: I99a0333ea7b982d96e3a85a72fb23b0f149982d0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-07 10:39:54 +01:00
Orgad Shaneh
9c2923b05f Fix simple_test_app compilation with Qt < 5.2 
Change-Id: I3b903eb790e27e21d7759b989adf1e5077410677
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-19 07:30:51 +01:00
hjk
23d6a1a23e Debugger: Add dumper for QTimeZone 
Change-Id: I1b20529d7ecdcbf5480e95d6e7be89a2fdb6a8b7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-16 13:42:03 +01:00
Orgad Shaneh
0be7ab1af2 Fix tests compilation 
Change-Id: If8c5f6ca040cdcdee883b91e1909acbd5dfc4922
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-12 10:36:56 +01:00
hjk
242cb17919 Debugger: Adjust QDateTime dumper for Qt 5.2 
Change-Id: I53a5701c9d1791e2705eafb258ff440f97e53b87
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-02 15:14:42 +01:00
hjk
ee8ddc3564 Debugger: Restrict std::unordered_map manual test to C++11 
Change-Id: I13788acb6cfa9a659482d64bead10dd27e71fade
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-27 10:01:54 +01:00
hjk
2d7b0d09ae Debugger: Add manual test for lambda 
Change-Id: I288826b0aed94de1f42a9eaddf3d40575e4e13e1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-27 09:39:49 +01:00
hjk
fefbc172f2 Debugger: Use thread id, not model row to remember current thread 
Task-number: QTCREATORBUG-9207
Change-Id: Ic98fb9a99c250dccf2735f28d0d3fefa7d1da52f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-17 22:55:22 +01:00
hjk
7f6c793f75 Debugger: Fix passing of maximum string length 
Change-Id: I96498b93bb1632de8ca960ae24ec54e31f8c0897
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-17 18:28:51 +01:00