Commit Graph

4400 Commits

Author SHA1 Message Date
Robert Loehning
6f6ee546cd Squish: Added some to list of test files
Task-number: QTCREATORBUG-8272

Change-Id: I248ee83c5f6b5db4189ac1b5458ba5f884a996a9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-04 14:05:39 +01:00
Fawzi Mohamed
f3a5a60762 qmljs: fix tst_qmlcodeformatter for qt5
qt5 needs a QGuiApp to access fonts (as TextDocument does).

Change-Id: I2779501532ada817dc22f48b5eb9f5af1bb9c3aa
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-12-03 13:41:44 +01:00
Fawzi Mohamed
66eb27e687 qmljs: indent expression in if condition and indent lambda expressions
* indent expressions (like function defs) in if condition
  fixes QTCREATORBUG-7243

Change-Id: I61197317a8dcba72a45b660600711748e2e2b962
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-12-03 13:41:22 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
2012-11-30 17:02:35 +01:00
Christian Stenger
18e0363c71 Squish: Remove unnecessary calls to clean up
Change-Id: I981392e5ef3397c3b80f1031e0644f84de1445f2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-28 21:11:05 +01:00
Robert Loehning
c6e7412626 Squish: Update for renamed wizard
Change-Id: Ib8c5766171aa87c112286073ef82e776a0dc45e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-28 13:45:54 +01:00
Christian Stenger
e53b4a9c76 Squish: Removed some Mac workarounds
Change-Id: I85a4fee5acbb36096283daec982a8d31e42573b4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-27 15:29:53 +01:00
Christian Stenger
f049c58c5f Squish: Try to remove the strange snooze() call
Change-Id: Ic2a475bf27167e8e3c3d3d1b5dcfb02cfbecaad3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-27 14:19:13 +01:00
Orgad Shaneh
dba973c933 Valgrind: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I935579630c4d2f3a7bce69756da9eceb5e2bc005
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-27 09:06:15 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Erik Verbruggen
cab6ed5e51 Fix: no scope walking for name resolving after MemAccess operator
Change-Id: Ic093079fa65d8d749911fd9f5b0f629e9fe68a1e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Conflicts:
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: I87d305e2d68582aa00b92f9599368615cd76ec74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-22 16:39:47 +01:00
Nikolai Kosjar
d0f3d7cb89 C++: Clean up dev tools.
* Add -h and -help options describing the tools and their usage.

* Make the tools compile and run on Windows (MinGW, MSVC).

* Rename project dirs, executables and main source files to more
  meaningful names:
  - Use same base name for project dir, *.pro file, main source file
    and (if applicable) script file.
  - Use the prefix "cplusplus-".
  - The names are now:
      - gen-cpp-ast/generate-ast --> cplusplus-update-frontend
      - mkvisitor --> cplusplus-mkvisitor
      - cplusplus-dump/cplusplus0 --> cplusplus-ast2png

* Get rid of 'c++' shell scripts.

* Get rid of duplicates of 'conf.c++'. Rename to 'pp-configuration.inc'.

* Introduce src/tools/cplusplus-tools-utils containing common stuff
  that is used at least in two tools. 'pp-configuration.inc' can also be
  found here.

* cplusplus-update-frontend:
  - Print file paths of written files to stdout.
  - Convenience: Use default values referencing the appropriate dirs and
    files.

* cplusplus-mkvisitor:
  - Take only one argument, namely the path to AST.h.
  - Convenience: Use default path to AST.h.

* cplusplus-ast2png:
  - Make it run without LD_LIBRARY_PATH.
  - As the name suggests, generate image files in png format (needs
    'dot' from graphviz).
  - Convenience: Read from stdin, which useful for small snippets.

Change-Id: I79c4061fce4a1571c0588dfedd50d4a70715d9df
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-22 14:11:58 +01:00
Thomas Hartmann
5e243dabd9 QmlDesigner: export core functionality
We export the core functionality of the model allowing
other plugins to use it.

The general functionality was already there, but I had
to rename the macro to avoid name clashes.

Also I renamed the .pri file to avoid confusion.

Change-Id: I88203ce9dbfddc8d734e5e232ff71bc0e244e5b8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-21 16:00:24 +01:00
Erik Verbruggen
8cbf0e7045 Fix: no scope walking for name resolving after MemAccess operator
Change-Id: Ic093079fa65d8d749911fd9f5b0f629e9fe68a1e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2012-11-21 14:38:00 +01:00
Thomas Hartmann
d19d254df6 QmlJS::SimpleReader: adding unit test
Change-Id: Iff063bc8037fe11e7f7dd1662408c5a2d0e381cd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 13:59:04 +01:00
Thomas Hartmann
6cf321a316 QmlJS:SimpleReader: adding support for arrays
Also adding test.

Change-Id: Idaf0aeacbb6f78e5c8404db740c2a8b7b297dad2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 13:58:58 +01:00
Robert Loehning
7c9c1924f0 debugger: compile fix in self test
MSVC does not support #warning

Change-Id: Ie9f9575a53c4c124e2ecffc6ad55181f2049ec5f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-21 08:31:29 +01:00
Robert Loehning
feae690513 Squish: Update for Target -> Kit renaming
Change-Id: I3c8ae3c67f2459c13b885ed935bb1dc31e09c359
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-20 12:44:15 +01:00
Robert Loehning
696c898377 Squish: Handling different cursor behavior on Mac
Change-Id: I21dfc2783ee6cb3f83f7ce54a809593cabe03495
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-19 16:03:58 +01:00
hjk
c3ce444c8e debugger: add dumper for QStringRef
Change-Id: I6a3b732de5b2741ba2f19f012dd59373ce94377c
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-18 00:21:09 +01:00
hjk
9a204ebe7a debugger: don't show large uint64_t as negative values
Task-number: QTCREATORBUG-8215
Change-Id: I1b7ef66f82b69c55d4a9778ad9ac79437d00022a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 11:43:12 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
2012-11-09 11:20:10 +01:00
Thomas Hartmann
5debabc410 QmlJS: adding SimpleReader
SimpleReader is a !simple! parser for json like qml files.
SimpleReader only parses literal properties for e.g. configuration
files.

SimpleAbstractStreamReader allows event based parsing and SimpleReader
stores the parsed data in a reference counted tree structure.

Change-Id: I0f6422a97f5c356149c516f227f8bbd7b736a6d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-07 16:42:28 +01:00
Robert Loehning
122585dc5a debugger: make USE_AUTOBREAK work with MSVC
Done-with: Joerg Bornemann <joerg.bornemann@digia.com>

Task-number: QTCREATORBUG-6495
Change-Id: Ic58430c14959985e824eb977d72874569b9fb617
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-07 16:24:54 +01:00
Nikolai Kosjar
492ca1cbcf Tests: C++: Make tests run from shadow builds.
For shadow builds some tests couldn't find their test data. Solved by
using the same pattern as in Qt tests: Inject $$PWD as SRCDIR via a
DEFINES statement.

Note: It was considered to use QFINDTESTDATA for Qt5, but this was
rejected due to:
 1) It's Qt5 only (would mean to introduce some wrapper...)
 2) As the doc states, it will not work with QTEST_APPLESS_MAIN tests.

Change-Id: Ie6cf59570fe61725b7f6f83b7da650331ddb38fc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-07 14:10:24 +01:00
Nikolai Kosjar
9f38f7bfbc C++: Store lambda captures in the code model.
Done-with: Erik Verbruggen
Task-number: QTCREATORBUG-7968
Task-number: QTCREATORBUG-7949

Change-Id: I0cf727052d0a3536ed96ee894b18768c9538c213
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-07 13:36:20 +01:00
Robert Loehning
77313fd980 Squish: Removed pointless explicit timeouts
Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-05 12:59:07 +01:00
Nikolai Kosjar
fb61be5ed6 Qt5: Correct usage of testlib.
This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and
Qt5 support "QT += testlib".

Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-05 12:58:53 +01:00
Robert Loehning
88d52c1d59 Squish: Added test case for deleting files outside of editor
Change-Id: Ib9724e0794dab7e4b2de39e72d671c8bf8f27b08
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-11-05 12:57:38 +01:00
Christian Stenger
39b3c0a1e8 Squish: Test for reverting unsaved changes
Change-Id: I54398b5b576b9b715e473861e287546afdb4f32a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-01 17:09:58 +01:00
Christian Stenger
47289addff Squish: Test handling of read only files
Change-Id: I459fdaed7338f5343b760da47e9652baf78986f0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-01 17:09:40 +01:00
Christian Stenger
270207f77e Squish: Update README file
Change-Id: I12761ec48af3a05d83dcaffe66b7e413d2fd4937
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-01 13:40:19 +01:00
Robert Loehning
90058c2a85 Squish: Update in CSUP02
Change-Id: I50cd4cf4ac794686db436274376ef13197631041
Reviewed-by: David Schulz <david.schulz@digia.com>
2012-11-01 07:35:17 +01:00
hjk
bebc351c35 debugger: add manual test for rvalue references
Currently shown as normal references, but that's according to
what gdb reports.

Change-Id: I7d56429b8cca128accb8a638992ea7e4e8241305
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-31 15:02:16 +01:00
Robert Loehning
b565197145 Squish: Updated function pickVersion474runVerify()
Change-Id: I02733645a6367429ce97007cfa4b882534786d78
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-30 09:54:50 +01:00
Robert Loehning
e60d2af0b1 Squish: Updated iterateBuildConfigs() to handle multiple kits
Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-30 09:54:22 +01:00
Robert Loehning
20d4efb0b1 Squish: Removed unused functions
Change-Id: Idf66788a8f693d836fafe26f3355a96395066c37
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-29 18:28:01 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Robert Loehning
1f9e226e77 Squish: Closing file after reading
Change-Id: I69f53c7626bbdb14874d0e5d459fa0ac346d40a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-29 11:03:21 +01:00
hjk
fc31836ebd debugger: compile fix in manual tests
Change-Id: Ifeea11c5430e3d4d55273472fdbc2a732ea08d46
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-26 11:02:07 +02:00
hjk
bddec831d8 debugger: add manual test to start processes
Change-Id: Ia24fa547d1121f819f27248c67b4fbee0ff7512e
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-26 09:06:52 +02:00
Robert Loehning
95af1cd4f8 Squish: Added helper functions for views and models
Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-25 13:58:34 +02:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
Nikolai Kosjar
112f80c6c6 Qt5: Fix warning "qtestlib is deprecated".
"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-24 13:51:16 +02:00
Robert Loehning
d4c8f23999 Squish: Added tool to convert objects.map into tsv
Change-Id: Icd86b82d55f0c994c80be04fc0006d577d11d2de
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-23 17:04:46 +02:00
Alessandro Portale
6b7501a1e2 Appwizard test: Fix compilation and warnings
Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 16:12:34 +02:00
Nikolai Kosjar
6481deb8c8 C++: Fix crashes in tests with Qt5.
tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since
they need to access some font settings via QTextDocument /
Q*Application. Use QTEST_MAIN instead.

Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-10-23 14:07:35 +02:00
Nikolai Kosjar
5d730be06e C++: Compile fixes in tests and tools.
After some refactorings not all usages, especially in tests and tools,
were adapted.

Change-Id: I7ed24bb1c8e55e55ed74eda3a8fd7610e725f4cb
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-23 12:26:47 +02:00
Christian Stenger
86e544ce4c Squish: Fix typeLines()
Change-Id: I13abcceebc3f61b508da658d5e9d4650fddff6ea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-23 09:16:06 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00