feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
47,159 Commits 108 Branches 368 Tags
3adef3cc7c84fb24fcf9630b47d2ac91cff6dd42
Commit Graph

1025 Commits

Author SHA1 Message Date
Oswald Buddenhagen
45b854dbd5 enable c++11 really globally 
... and remove all instances that became redundant now.
this excludes everything that comes from outside qtc, or looks like it
could "leave" it.

Change-Id: Idc8baad17cd1ffdc5e160ec48ea3292d633a2562
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-08-02 07:52:38 +00:00
Thomas Hartmann
3bd9dbf5b2 QmlDesigner: Adding testproject for directory imports 
Change-Id: Ib9f4feb745722dc1e43c6651ed1cfc4a017818e7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-07-29 12:04:17 +00:00
Oswald Buddenhagen
034cff4693 Merge remote-tracking branch 'origin/4.0' into 4.1 
Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
 2016-07-27 12:45:54 +02:00
Tobias Hunger
5efd82468b SynchronousProcess: Store raw bytes from stdout/stderr of the process 
Only convert the raw output later in a stdOut() and stdErr() method of
the SynchronousProcessResponse.

This is necessary since we have processes that use different encodings
for different sections of the file (I am looking at you, git).

Also remove the signals for raw data on stdout/stderr, leaving only the
signals returning buffered QString lines. This should be safe, even
with UTF-16 output.

Change-Id: Ida613fa86d1468cbd33bc6b3a1506a849c2d1c0a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-15 14:16:03 +00:00
hjk
26fa769bab Debugger: Add dumper for QMeta{Enum,Method,Property} 
Task-number: QTCREATORBUG-16593
Change-Id: Iaa710660d8ef69459596f93831cf8467913f0468
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2016-07-15 10:44:03 +00:00
Brett Stottlemyer
7f07ec41ab [test] Use command line in proparser 
The test reads the command line, but skipped the commit.

Change-Id: If38a5fdd1ec129d77065bfd90403e21fea4eda6d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-07-11 12:41:12 +00:00
Orgad Shaneh
847637708f Tests: Use Qt5-style connects 
The heavy lifting was done by clazy.

Change-Id: If3332a2b4a6d011d2cb74996f5dd750452093f31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-28 12:54:02 +00:00
Thiago Macieira
74fed1d5b7 Fix build on PPC: PPC is defined to 1 
$ powerpc-poky-linux-gcc -dM -E -xc /dev/null | grep -i PPC
 #define _ARCH_PPC 1
 #define __PPC__ 1
 #define __PPC 1
 #define PPC 1

Not on PPC64, though (only __PPC__ and __PPC64__ are defined).

Change-Id: Ib57b52598e2f452985e9fffd145812f5098e441d
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-06-22 17:51:20 +00:00
hjk
b198d482cf Debugger: Robustify Qt version extraction 
Task-number: QTCREATORBUG-15497
Change-Id: I61b52d23e0acf69e2030f8dca2691fbaa6b309ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-07 05:33:13 +00:00
David Schulz
6c18ed50d2 Tests: Fix linking reactivated manual plugins on win. 
Change-Id: Ibd4db0c6a065dd264f693d663b4a940d2f3a7e58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-06-01 11:05:03 +00:00
Orgad Shaneh
8de20c9d6c ExtensionSystem: Revive manual test 
Change-Id: I24c627e964afa33883bde571960ed390b07be985
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-06-01 05:34:28 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0' 
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
 2016-05-27 12:01:36 +02:00
hjk
fbc82d3f88 Debugger: Fix dumping of numeric QJsonValue inside arrays 
Task-number: QTCREATORBUG-16313
Change-Id: I544e89fc964cd404652d8ea0c8df127e51235292
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-24 13:09:19 +00:00
Ulf Hermann
6b4963b549 Ssh: Implement tcp/ip forward tunneling 
Change-Id: I529b3392ea7e4cbae2c736c9f55352ef6b19da98
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-05-23 07:44:06 +00:00
Eike Ziller
0f94aa3f4d Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
 2016-05-03 11:49:01 +02:00
Christian Stenger
43f245bda3 Tests: Fix missing return 
Change-Id: I78fdad351d7389f2d046c2cf1793cdca2d972815
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-04-28 13:55:33 +00:00
David Schulz
abeac62191 Fix building creator with the intel compiler. 
Replacing all occurrences of win32-msvc* with msvc.

Task-number: QTCREATORBUG-16118
Change-Id: I46bd54628bffb04c24bca587fd9dd7684e888f1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-04-26 12:32:54 +00:00
David Schulz
cc04b84917 Fix compiler warnings on windows. 
Ignore some warnings inside 3rd party code and fix a lot of conversion
warnings.

Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2016-04-22 07:37:31 +00:00
Eike Ziller
1ae483fc83 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
 2016-04-05 14:11:47 +02:00
Kai Koehne
dc16ca8552 Remove tcpportsgatherer 
Has not been used since a while.

Change-Id: I53cf42d723c2f4d822ad63923b857f119e5cfa58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-04-04 11:19:42 +00:00
hjk
39a38d5679 Wholesale conversion to #pragma once 
Kudos to cgmb and https://github.com/cgmb/guardonce

Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-03-30 15:20:19 +00:00
Christian Stenger
2123ce49a2 Debugger: Make manual tests compilable on OSX 
Change-Id: I1a17677bf5636addcbb291097613006d0324070c
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-03-16 09:20:52 +00:00
hjk
41a24ade75 Debugger: Make manual tests compilable without Qt Script. 
Change-Id: I9464ce8dfc22e107c8f97a139092f0a9a338bbf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-16 09:10:29 +00:00
Robert Loehning
bc921b46a2 QmlDesigner: Explain frequent mistake in test project 
Task-number: QTCREATORBUG-15772
Change-Id: I0910d0fce3f93c72febf15b4590c36768146b972
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-24 11:25:24 +00:00
Robert Loehning
54e553ac9b Tests: Add test for "using" keyword 
Change-Id: I7c1563a69fe6f135a15eb86c1bcfe6b8050de193
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-02-24 10:29:25 +00:00
Thomas Hartmann
0642c10512 QmlDesigner: Adding manual test for dummy data 
This is a small project that tests the dummydata feature.

Change-Id: I710ec6ac8ebf86c85a155a812e581cca88845666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-22 13:39:03 +00:00
Thomas Hartmann
8aaf3a0922 QmlDesigner: Adding manual test for dummydata context property 
This manual tests shows how to add a simple context
properties for the Qt Quick Designer.

Change-Id: Ied47bc6acbab32d782f6827cf849711aed600821
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-02-22 10:33:04 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation 
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 16:01:06 +00:00
Christian Stenger
b17fbfcd75 Tests: Fix compilation 
Introduced with 33ad0f1031.

Change-Id: Icbee16c3e4e771a81e885d3daa3a5386960ecbd8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2016-01-07 15:57:18 +00:00
Robert Loehning
ce3edb5621 Tests: Disable testQThread by default 
Change-Id: I1ece1bd56a7d2806fa13afeb295fd9c76049e07b
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-12-08 09:45:35 +00:00
Nikita Baryshnikov
4ec9019104 Debugger: fix metatype declaration macro usage 
in places where we do not need it.

Change-Id: Ifb7eba6f46bf79f2cfe968ab8b71cca3a7d51efd
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
 2015-08-28 11:04:27 +00:00
Robert Loehning
7e30a74d41 QmlDesigner: Remove unsupported testfiles 
Change-Id: I236b26646752783d4956f3c290d1e6463bef5efa
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-07-09 09:56:11 +00:00
Tobias Hunger
2e6855249f PNG: Run pngcrush on images with iCCP or sRGB profiles 
This quietens warnings from libPNG during startup and shrinks the
image sizes.

Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-07-03 09:50:46 +00:00
Christian Kandeler
28e163de97 SSH: Fix exit code of tests. 
The test apps now return != 0 in case of an error.

Change-Id: I2380bc4b8e0c85e68d79f90ccc39ad9419851b04
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-06-29 08:59:09 +00:00
Christian Kandeler
2ed0592dea SSH: Fix error in test. 
Change-Id: Ifda41d0fdef54cbc1c5e397be6782bda7a047098
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-05-27 15:03:39 +00:00
Christian Stenger
ad34764605 Make shootout test work on OSX 
Change-Id: I0cac98b68ee67eb016e32eeb17fc41a2cce38d9b
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-05-12 12:15:27 +00:00
hjk
40a76e2b45 Add std::map case for initializer list codesize shootout test 
Change-Id: Iffb1193bfb741533645521b30d9181aa61dc5c12
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-05-12 09:29:59 +00:00
hjk
678de21337 Add codesize shootout test for map initialization 
1286 bytes when using an initializer list,
7414 bytes for the insert(..., ...) sequence.

Change-Id: I10ad8b10fea962feb01e9dbb31a542a4b66680a7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-12 07:58:01 +00:00
Daniel Teske
3f183b7ee0 Purge deployment.pri 
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.

Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-04-28 09:32:07 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4' 
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
 2015-04-15 17:45:47 +02:00
Christian Kandeler
bde83c30bf SSH: Fix TCP/IP forwarding support. 
We hardcoded the remote host to the SSH server for some reason, and the
originating port was bogus as well.

Change-Id: I8f6700bc12f4374302dd3bfc035c9c9f060f56ef
Reviewed-by: Caspar Romot <cro@icd.ee>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-04-15 13:06:29 +00:00
Orgad Shaneh
a79df8e1e7 Utils: Make SynchronousProcess use second based timeouts 
Change-Id: Ie2de2359225017cae7181bee0df17542fa36efd8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-15 12:42:46 +00:00
hjk
2b7c83bfbf Tests: Add a shootout test for implementations of operator== 
That's for a structure mimicking QMakeStepConfig, comparing
a.x == b.x && a.y == b.y ... with
std::tie(a.x, a.y, ...) == std::tie(b.x, b.y, ...)

Executive summary: gcc 4.9.1 optimizes the traditional == && == better.
This is solely due to the sequence of four bools in the struct.

Change-Id: I77cc8d685c6b7b7ead651cd1f44ff1b2e9b39f3d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-03-23 12:09:45 +00:00
Orgad Shaneh
b1e839c21b Tests: Cleanup project files for Utils tests 
Change-Id: I75ad17d12994376d88117570250a6c45e7495fea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-17 09:39:19 +00:00
Christian Stenger
c9c7d32bd7 Tests: Fix shootout test running on Windows 
Change-Id: I0774429a3106fc0e382852a4ed50d2e2ffc8e164
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-06 07:31:15 +00:00
hjk
e35809bd31 Add shootout test for multiple identical lambdas 
This helps to compare code sizes generated by lambdas.

Change-Id: I6734a26f59ec622ec8d4dfdea2c9e83340c11d73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-04 09:29:55 +00:00
hjk
97cbfb95bb Add manual test code to check generated code size 
Change-Id: Idc65f441c3af09f1fcd5cff646cc7b472aed1770
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-20 10:01:09 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Orgad Shaneh
74ed591db3 Misc: Remove unneeded qualifications 
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-06 12:20:28 +00:00
Thomas Hartmann
bc2424c3c6 QmlDesigner: Adding test cases for layouting 
Change-Id: Id06a24e1c17eea3f7e4d5231e68ade49cdf775f4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-02-06 08:57:58 +00:00