feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
61,421 Commits 108 Branches 368 Tags
005e7aa54de0932323e44f752a4b51a421d0dc7d
Commit Graph

1082 Commits

Author SHA1 Message Date
Aurindam Jana
7a090b3dd5 TcpPortsGatherer: Refactor code 
Use QAbstractSocket::NetworkLayerProtocol enums.
Minor changes in API and internal functionality.

Change-Id: Idd786c71e3474b1010cc5f2d72dc09126bfd2e29
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-03-21 12:30:25 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
 2013-03-18 10:19:14 +01:00
Kai Koehne
e920010ea4 Debugger: Fix manual test case for QtQuick2 
Change-Id: I1ccc631a6e03b0e1229fa23d13ff13303166df80
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-14 13:54:08 +01:00
hjk
d44bac6f43 FakeVim: Make plugin standalone if necessary 
It's possible to use FakeVim as standalone plugin for a QTextEdit or
QPlainTextEdit widget, so there should be minimum dependencies on
Qt Creator code.

Change-Id: I415ed87f5e4d97ea78d9d25a8f0c82701ef1f70d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-08 17:53:14 +01:00
Orgad Shaneh
ef8787e59f Fix tests compilation 
Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-03-05 09:01:18 +01:00
Jan Kundrát
b9a4cac0b3 Fix building with -DQT_NO_CAST_TO_ASCII 
Change-Id: Ie919eff17c3122a70f4a8f3349b399e0a62017aa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-26 09:20:12 +01:00
Jan Kundrát
eb97b2b1cb tests: fakevim: fix building with QT_NO_CAST_FROM_ASCII 
This is apparently the default in my build environment.

Change-Id: I7bcb971a0e819b9a7693c08e95fe73a0b6ff7bbc
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-26 08:10:03 +01:00
Robert Loehning
2c7347b8ed Updated license headers 
Change-Id: I3ff71d3a686453e92ba8724e75a1879f48653d11
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 13:30:48 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Robert Loehning
3898effa68 debugger: compile fix for MSVC in self test 
Change-Id: I44304538e18775833a995a50d6b696d666083baa
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-23 14:03:16 +01:00
Robert Loehning
ef3647ad43 debugger: Updated self test 
Change-Id: Id9eeb62ff336843ce196dfebc771f03ae22d3cbc
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-22 17:49:58 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
hjk
6d785dd7d7 debugger: fix warning in manual test on mac 
Change-Id: I73809b42bb13bd38d9a30286334621b3b6e654dd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-19 16:36:07 +02:00
Eike Ziller
49d5c2381a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
 2012-10-18 10:40:11 +02:00
Robert Loehning
f15745ab42 debugger: Fixed automatic run of self test 
Change-Id: Icf2c100db571a37bc9e20e0e9cab47a627cfec23
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 20:31:27 +02:00
hjk
9f1d8b66e3 debugger: fix display of gcc's built-in vector types 
Change-Id: I293be4f5c207828c64de30236a25f6c0062346b8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 15:25:04 +02:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
 2012-10-11 21:11:40 +02:00
Robert Loehning
6bd79c979e debugger: Fixed issues in self test 
Change-Id: I06802b87f861307de3c8d2b617455afdce0127a4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-10 19:36:56 +02:00
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
 2012-10-09 14:27:29 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 12:24:24 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
hjk
fac636602f debugger: fix build of manual test app with Qt 5 
Change-Id: I58f63941038978b665455025313faafc851bccc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-04 17:27:02 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Christian Kandeler
a49e1e0104 SSH: Fix tests. 
Enable compilation with Qt 5 and remove a warning.

Change-Id: Ieed6ef829551122f37b4ce052288f8e0f76c9716
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-09-26 11:39:38 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
David Schulz
44177392ec Debugger: Add missing continue to simple test 
Change-Id: Ief142db796db9392d7d910c98c0dd1425e5f1230
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-19 16:35:40 +02:00
hjk
19a7f66df3 debugger: add gnuplot based display for QVector 
Change-Id: Ic24a0d77906a59bc2c216ef0d6dd655695e2033e
(cherry picked from commit 41ac231ddfbabec6c09101345cf4d1370646f027)
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-10 12:16:46 +02:00