feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,206 Commits 108 Branches 368 Tags
45361755f997a2a2714c95be73dda3900b51fd03
Commit Graph

2960 Commits

Author SHA1 Message Date
Oswald Buddenhagen
5ad0908087 remove redundant cpptools.pri include 
Change-Id: I09bc8a20a3608b52784de2b262b2f06ac7f217bf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-02 17:11:02 +02:00
Oswald Buddenhagen
cf5937a8ef remove redundant INCLUDEPATHs 
src/plugins and src/libs are included by qtcreator.pri

Change-Id: I15ec19856366661bfa74d00e6278f4eb3854acb2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 17:10:07 +02:00
Oswald Buddenhagen
3893bb13b4 fix include style and remove subsequently redundant INCLUDEPATHs 
Change-Id: I9e6950d30c7a65229559c7046a7cc8c903964065
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 17:09:47 +02:00
Orgad Shaneh
f35f7b207f Tests: Remove unneeded define 
It is unneeded for any Qt version since commit
3d629b1a2b

Change-Id: Ib58795a53eb3f5614a722282439d26d3250f7d03
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-02 15:15:43 +02:00
Christian Stenger
e6c0c292b9 tests: move valgrind into auto tests 
* re-added some test data files
* added QSKIP for not existing data files

Change-Id: Ie0ae3f563e0d94534b620320176b7ec56e36d313
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-04-02 14:20:23 +02:00
Orgad Shaneh
d5e41c08f5 Tests: Add missing include for MSVC 
Change-Id: I95196a8d57a8bf8f09a52aa54fa1c8bbfe752168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from commit 1db74e381c)
 2013-04-02 14:14:46 +02:00
Orgad Shaneh
b2705f6dd0 Tests: Remove utils dependency from FakeVim 
Required sources are compiled by the test project

Change-Id: I74f43ba46cf7aab88acea65becd0de86c156f268
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-04-02 14:01:57 +02:00
Oswald Buddenhagen
c61210089f define QT_CREATOR centrally 
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 12:20:37 +02:00
Robert Loehning
003821f936 Squish: Prepare tst_CCOM01 for Qt5 
Change-Id: Ic2806673cb65018000bcbe6ae66dad1b2f555e39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-28 18:57:43 +01:00
Christian Stenger
7f0ff88c61 Squish: Speed up removal of registered documentation 
Change-Id: I0a639ee608b0430a98840406ab14e224d1a64d49
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 17:24:29 +01:00
Christian Stenger
a4dda7bc8d Squish: Raise snooze() time when using Mac filedialog 
Change-Id: I92b6a6a449e2df6a2ce92c277d9a1fa326b36606
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 15:09:50 +01:00
Eike Ziller
d3c979dc0f Merge remote-tracking branch 'origin/2.7' 2013-03-28 12:19:45 +01:00
Christian Stenger
7c4478c4b9 Squish: Add Mac workaround to tst_revert_changes 
If the editor had not been clicked before invoking the
Edit menu Creator does not notice that the editor has focus,
so all subitems will be grayed out.

Change-Id: If8b23fd6abae1bac6b3387e9a5394cfb4b84529d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 09:22:51 +01:00
Christian Stenger
adafc02192 Squish: Fix detection of ABIs on Mac 
Change-Id: If3cca65f1f3ccf7e62dc79cde72d1bce41ab92b9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 09:22:43 +01:00
Orgad Shaneh
d59651cb39 Tests: Export plugins in PluginManager 
Without this, lib file is not created using MSVC, and
the build of dependents fails

Change-Id: I37ca02d8e1c6b99fdf901679ccee932f1ed55450
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-28 09:02:43 +01:00
Robert Loehning
d41e01696a Squish: Added Qt 5.0.1 Kit 
Change-Id: Ia5c81254de3bd2ad3537ac3a300aa2dbe0e16015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 17:11:41 +01:00
Orgad Shaneh
aa3dcd92b7 Tests: Fix compilation with Qt 5.0.1 
Change-Id: I6e9d5fd34bec8cbecaa4868b5e07cc11d490d6d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-27 16:17:16 +01:00
Orgad Shaneh
6dc975a8ad Tests: Fix MSVC errors and warnings 
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-27 16:14:24 +01:00
Orgad Shaneh
1db74e381c Tests: Add missing include for MSVC 
Change-Id: I95196a8d57a8bf8f09a52aa54fa1c8bbfe752168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-27 16:10:01 +01:00
Christian Stenger
f706d18374 Squish: Fix problem with Mac menubar 
Change-Id: Id03f060acb1ba343cfd1ff9199f3f1de46abd58b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-27 14:29:29 +01:00
Robert Loehning
5aa0f06817 Squish: Make __getMkspecFromQmake__() ready for Qt 5 
Change-Id: I9a2776ad30f718b6d201f738e1f1f158110c1f29
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:12:19 +01:00
Robert Loehning
bf3ab4f0db Squish: Fix clicking Qt versions 
Change-Id: I8252b2a9a7bfe7b9fe1d1660a15d780f9a0560ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:09:01 +01:00
Christian Stenger
c3ef30796a Squish: Add workaround for Mac issue 
Change-Id: I516afb90001864082fb32678c92215cfd4b79518
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-26 17:24:24 +01:00
Kai Koehne
d1aa986735 Fix checks for qt modules 
The fix in 823d48d218 had a typo
(Qt vs QT). Also fix other places where QT_CONFIG was used to
identify Qt modules.

Change-Id: Ie32b678b959f7b5573574ef87ae7ad92860e8323
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-26 16:41:54 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Robert Loehning
0bb911f640 Squish: Make selectFromFileDialog() more stable 
Change-Id: Ia454bc3174fa48602e181f4848944c0299a95517
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-25 17:52:46 +01:00
Robert Loehning
d3c94a6c4a Squish: Updated createProject_Qt_Console() 
Change-Id: I7c3efd967f292ce5b132eeba79e51f9aabc54501
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-25 13:56:36 +01:00
Robert Loehning
6f5ce19797 Squish: Added tst_simple_analyze 
Change-Id: I65a6bff6e99ad608639b26452e6700d28e8fbe0a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-22 13:37:14 +01:00
Robert Loehning
3df6756911 Squish: String update 
Change-Id: I67a597021c9af809e852e6cca02c570a5e3764e8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-22 10:32:42 +01:00
Nikolai Kosjar
e088541c0d C++: Temporary fix for dangling pointers in ResolveExpression 
Task-number: QTCREATORBUG-8974

Change-Id: Iac114881741bdf8fd477541b28e4d31b7a1760f0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-03-22 08:57:53 +01:00
Christian Stenger
c11d901e03 Squish: Improve copySettingsToTmpDir() 
Provide ability to omit files while copying the settings as well as
a given destination instead of always using a generated folder.

Change-Id: Ie4a97a90feeff4fd8a8de8b6f0b95a412c17a14c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-21 16:53:48 +01:00
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
David Schulz
b8d5c762ec Debugger: Port Dumpertest to be used with cdb. 
Change-Id: I18fbd216d761ef66a9628e84669d6cd5b493d7b7
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-03-20 10:43:33 +01:00
Robert Loehning
5db9e59eca Squish: Warn about handling two different signals 
Change-Id: I6877b0d6d0a1e5e1961e9c8fc054ac096c34c6cb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-20 10:10:08 +01:00
Robert Loehning
a4764ad9ef Squish: Fix tst_create_proj_wizard on Mac 
Change-Id: I0f69e7d34ee4fb1dec2f30e916ff29a33fb5111a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-19 13:58:13 +01:00
Christian Stenger
b2d9290c40 Squish: Fix tst_HELP06 on Mac 
Change-Id: Iaea464d2f76c06566b0c9eeb9bc4572e2e90facc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 13:50:39 +01:00
Christian Stenger
aef3493af2 Squish: Fix using context submenu items for Mac 
Change-Id: I9ab351777f0bae7d15173d0c6cf5eb2f7f719810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 13:23:17 +01:00
Christian Stenger
20fe2651a5 Squish: Fix for tst_installed_languages 
This has been fixed now and is no more different on Mac.

Change-Id: I942164e964cce9df1c369c68036875e0da98a96a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 09:07:58 +01:00
Christian Stenger
67710829fa Squish: Let tst_create_proj_wizard test for Madde too 
The test will now execute as before, afterwards enable the Madde plugin
restart Qt Creator and perform the text again.

Change-Id: I08b6f3702af6541e0044f8ae047e42cc4f017a36
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 09:07:48 +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
Christian Stenger
f1a0af4b7e Squish: Fix running tst_qtquick_creation3 
...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.

Change-Id: Ic38267256c5ab8889d67fe6a4e7e46dba6515a67
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-15 15:37:36 +01:00
jkobus
7d41817ec3 Add cleanupSemanticsLossless for even betten diff output 
This can format the output in a more human friendly format:
EQ("Th") INS("at c") EQ("at cartoon") -> EQ("That ") INS("cat ") EQ("cartoon")

Change-Id: Iab545c0c0bccffa379f346e482b17b574e05e88a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-15 14:32:58 +01:00
Robert Loehning
6d8e352981 Squish: Fixed typos and white spaces in getConfiguredKits() 
Change-Id: Ic5b678af17232c3ebc2da448bb45f97160aa650c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-15 13:31:05 +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
jkobus
41fa8c3528 Add cleanupSemantics method, produce nicer diff output 
Change-Id: I877e06c930c219ad23af4b7c6078d8c8db3706e9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-14 09:36:15 +01:00
Christian Stenger
07d3e712fe Squish: Replace useless signal waiting 
Since Squish 4.2.3 the signal handling has been fixed and this
signal won't be caught by Squish because it was triggered by another
object.

Change-Id: I4a849084712ee99f9e63b844f832ba8dadd793ac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-12 17:22:53 +01:00
jkobus
2433ee7da0 Add autotests for diff editor 
Change-Id: I46c1d5c623b0ffd8c0dc16d218094d05c9975ea5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-12 13:56:54 +01:00
Robert Loehning
530b2f79eb Squish: Reduced timeouts in tst_memberoperator 
Change-Id: I0945c1752500a32b45320497e12d96fa7d8f623f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 12:39:51 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
 2013-03-12 10:56:52 +01:00
David Schulz
b46ec1db9d Debugger: Dumpertest: Add getter for autoremove property 
... to the TemporaryDir class for Qt4.

Change-Id: I5cecb4dd0af640485cdb3e4d7222ea675e060e01
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 10:48:24 +01:00