Commit Graph

2079 Commits

Author SHA1 Message Date
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
2013-01-16 16:46:03 +01:00
Fawzi Mohamed
285bffd99b tests/qmlproject: adding utils lib
Change-Id: I80c952ef8571229893adc6002b39812d6b738b9e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-16 15:46:35 +01:00
Fawzi Mohamed
7ae32b1331 qmldesigner: fixing tests
Change-Id: I2d98ea04860dfab083234904aa83f96cf6790472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-16 15:46:10 +01:00
Fawzi Mohamed
2f26e24b86 tests/preprocessor: adapt to api change
Change-Id: I79f79cf548933856cec3cdc59963c63d8f7062c8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-16 15:45:29 +01:00
Fawzi Mohamed
b9ddb34862 tests/cpp-frontent: avoid implicit ascii conversions
Change-Id: Iadd84891958f12d1f87ebe4c87e58f9ebd989697
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-16 15:44:52 +01:00
Fawzi Mohamed
5935ad14d7 tests/ioutils: fixing namespace change
Change-Id: Ie30abed23657e6c2d221877a236468650bbbbd2e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-16 14:23:45 +01:00
Robert Loehning
9741e70f30 debugger: Fixed checks for file classes in self test
Change-Id: I5bfe1047ad3b6fc6bd7080c15e6908a47e5ae5a8
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-15 19:30:54 +01:00
Thomas Hartmann
229105ba89 QmlDesigner: adding manual test files for Qt Quick 2.0
Change-Id: I44d3a4165d1ff12488bcc63f19765bc7cf91bc18
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-15 13:51:34 +01:00
Thomas Hartmann
9fd73a2175 QmlDesigner: Fixing broken test case
Since the rect is moved to 648, 480 nothing is visible.
It should be witdth and height instead.


Task-number: QTCREATORBUG-8543
Change-Id: I27721d6df83f5120315bc1f5aff4cc04732e4f60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-11 15:33:07 +01:00
Robert Loehning
1675beebf3 Squish: Fix WELP03
Change-Id: I811c394b95029addb84a727632cf2ab6901258a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-11 14:35:30 +01:00
Christian Stenger
0ba7f48d07 Squish: Try to fix test for testing machines
Change-Id: I3213594c9ad7b947c5863d22f87e62adf418d983
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-09 13:06:13 +01:00
Francois Ferrand
5e8c3f4be7 C++: fix constructor definition parsing.
When a constructor is defined with a single, unnamed argument of a custom type without
extra type specifiers (const...), then the constructor was not identified as such.
There was an heuristic in case the constructor was in the class definition, but not if the
the constructor was defined later.

Examples:

class Arg;
class Other;

class Foo {
  Foo(Arg /*arg*/);               // working
  Foo(const Arg /*arg*/);         // working
  Foo(int /*arg*/);               // working
  Foo(Other /*arg*/)         {}   // working
};

Foo::Foo(Arg /*arg*/)        {}   // used not to work, fixed
Foo::Foo(Arg arg){}               // working
Foo::Foo(const Arg /*arg*/)  {}   // working
Foo::Foo(int arg)            {}   // working

Change-Id: I741e4ba62672ddc99a837fdcdc27996fba5ae6c7
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 13:36:43 +01:00
hjk
ad03ebab19 Debugger: QT += webkitwidgets in semi-manual test
Change-Id: I551d0f49d6da2555cfe2acbd28ad5f76f20ea29c
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-03 20:52:27 +01:00
Francois Ferrand
058d2e8cb5 Support preserving case when replacing.
When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-14 10:22:41 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Ray Donnelly
b06c38d4d7 Fix caplitalization for MinGW-w64 cross compilation.
MinGW-w64 cross compilation packages always use lower-case filenames.
library name "Ws2_32" changed to "ws2_32"
include name "Windows.h" changed to "windows.h"

Change-Id: I405f2e23c3f136961f66fc5e1d0d98f760c46e2c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-12-13 12:00:34 +01:00
Robert Loehning
0877f4e254 Squish: Sorted test cases in suite_general
Change-Id: I270606e8d9c89988102b5c2d37d345f33bd8da15
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 18:14:23 +01:00
Robert Loehning
9dd750c57a Squish: Update in tst_openqt_creator
Change-Id: I4055cf6485bd89e756d7aba5f9e3df17d91eedd6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:50:58 +01:00
Robert Loehning
27421b1a81 Squish: Check installed languages
Change-Id: I758381d67c431b4b7d6b7486f1d8561cf09c637b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:33:31 +01:00
Christian Stenger
352f6d6c4b Squish: Provide overrideStartApplication()
Change-Id: I384d37f9c65b76c299220dea436e45ff58ba0333
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-12 14:51:21 +01:00
Christian Kandeler
707f1b4419 SSH: Adapt tests to API change.
Change-Id: I0b104942d97238aff8ac21e0e047a17079a53181
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-12-11 13:55:44 +01:00
Fawzi Mohamed
82a8e9bb86 qmljs: added persistent trie
Add a presistent trie to store imports, and provide a better (IMHO)
completion algorithm.
The trie is quite generic and it might be worth while to move it to utils.

Change-Id: I4081346af6215b1ee8ff14bd063c2a021d7c8218
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-06 12:57:48 +01:00
Nikolai Kosjar
d9571f2ecd C++: Update frontend accordingly to AST.H
$ ./cplusplus-update-frontend

Change-Id: I9015abb8d3dc053c91b0107c5a0b2e8b6e2f5f30
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-12-06 10:56:27 +01:00
Nikolai Kosjar
a281dfd4b1 C++: Tools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I9de2c7fe51fea7844813cecb7c68f9a85a8e1e62
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-12-06 10:56:10 +01:00
Robert Loehning
3f7413fd03 Squish: Added c++-file
Can be used in tests/system/suite_editors/shared/testdata/files.tsv

Change-Id: Icafd42dfa8892b7314767b178d6ac8c3735d6200
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-05 10:54:47 +01:00
Eike Ziller
f43e6ca7ad Merge remote-tracking branch 'origin/2.6' 2012-12-05 10:39:22 +01:00
Christian Stenger
8a6d5ccd36 Squish: Fix usage of Qt Quick UI wizard
Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-05 09:30:33 +01:00
Christian Stenger
04e8abfa4c Squish: Fix tst_create_proj_wizard
Change-Id: Id1609b5c4f46036e7a5fb90cd7fc720bd27c1844
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-05 09:30:23 +01:00
Christian Stenger
f47ca8f4d6 Squish: Fix tst_qtquick_creation4
Change-Id: Iff7ce74c947dba7522b47991fb0217916dee921a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-04 14:54:32 +01:00
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