feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
65,448 Commits 108 Branches 368 Tags
d65ef60ea24a25e636f5a51b51192abbc883da12
Commit Graph

99 Commits

Author SHA1 Message Date
Erik Verbruggen
368d5926ca C++: handle destructor names with template parameters. 
Change-Id: I74b4fd5e043db935abc18345b303d294b71e8fc2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-02-23 08:39:34 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Erik Verbruggen
3f5dc36a53 C++11: first set of changes for decltype. 
Change-Id: I49d6ff7eb1805cd07bdfcb27bb37d4c6cadc9115
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-02-10 16:29:04 +01:00
Erik Verbruggen
b9b117aabb Fixed testcases. 
Change-Id: Ia20094acbadcb6bec921ec77751f2c73a94e05cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-02-09 13:59:17 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Christian Kamm
67dd062a31 QmlJS: Merge new parser from Qt 5. 
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-12-07 11:24:59 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files. 
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.

Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-24 12:02:30 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kamm
412e61d2c2 QmlJS: Fix tests. 
* Some were not adjusted for the Document::MutablePtr change.
* The basic test failed because the welcome plugin failed to load.
* The check test wasn't updated for @disable -> @disable-check.

Change-Id: Iae848832f740363bc33915d7a202a6cff08e2189
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-11-09 15:54:43 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kamm
4565c12f2b QmlJS: Improve tests/tools/qml-ast2dot. 
Change-Id: Ifd06745ec823d09ae7b42318d418fa1adb01824b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-20 11:04:03 +02:00
Christian Kamm
eebb138d45 Fix compilation of tests/tools/qml-ast2dot. 
Change-Id: I192c8f218371bd45c5bc2ae2cbb1b4464b7f0956
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-10-20 10:07:59 +02:00
Friedemann Kleint
8b885e78fd Symbian: Fix CodaClient testing tool. 
Tested-by: Alessandro Portale <alessandro.portale@nokia.com>

Change-Id: I56db4b3427a87c1c67b44246e62f75a4f3ad9a77
Reviewed-on: http://codereview.qt.nokia.com/1826
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-19 14:40:38 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Pawel Polanski
78f98c1741 Symbian: Remove TRK releated stuff from tests 
Change-Id: Ie5142d4ee21470bceeeb3f27bc9f4646d6ac0af7
Reviewed-on: http://codereview.qt.nokia.com/501
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-06-20 12:00:50 +02:00
Bill King
dc5185111e make autotests compile again. 2011-05-13 17:00:58 +02:00
Pawel Polanski
06c94cda92 CodaClient now supports uninstallation 2011-04-15 11:42:07 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Bill King
4e7ad2a1b7 tests: Make them compile again properly 2011-04-07 09:10:37 +02:00
Bill King
3593fe08ae tests: add licence headers 2011-02-18 14:48:16 +01:00
Pawel Polanski
1c036c43bf Symbian: Refactor codaclient application to make it compile once again 2011-02-10 16:50:42 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
Pawel Polanski
440bba257a Symbian: Added a serial connection type to CODA 2011-01-31 11:34:05 +01:00
Friedemann Kleint
6b153c8747 Tests: Fix compilation/plugin test. 2011-01-20 14:43:06 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Friedemann Kleint
01d4c5a3d3 Debugger: R.I.P. old CDB engine. 2011-01-07 15:04:54 +01:00
Christian Kamm
16542241c9 C++: Add parsing of Q_PRIVATE_PROPERTY. 
Reviewed-by: Roberto Raggi
 2011-01-04 15:58:22 +01:00
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
Roberto Raggi
88fe5a50a1 Added semantic checks for stray semicolons and topldevel empty declarations. 2010-12-16 12:26:12 +01:00
Bill King
df43d55e04 Fixes: More autotest cleanup (now release target builds too) 2010-12-14 12:56:55 +10:00
Bill King
16dc934a48 Fixes autotests for windows. 2010-12-14 11:01:17 +10:00
Friedemann Kleint
88b77ba838 Symbian CODA: Add ping for serial, handle reading long messages. 
Some renaming and cleanup.
 2010-12-09 09:49:23 +01:00
Friedemann Kleint
d7ca39da06 Symbian/CODA: Add infrastructure for serial communication. 
Add USB protocol and chunking.
 2010-12-08 16:50:40 +01:00
Pawel Polanski
0a5cb17f25 Information about the time that took the CODA to process a command. 2010-12-07 15:23:32 +01:00
Friedemann Kleint
564092d6a0 Symbian[CODA-client]: Copy files in chunks. Fix usage information. 2010-12-07 11:05:25 +01:00
Friedemann Kleint
da31ea7641 Symbian/CODA client: Add put/install/stat modes. 2010-12-06 17:07:18 +01:00
Friedemann Kleint
1cba566ca3 Symbian: Start on a test client for CODA. 2010-12-06 13:52:47 +01:00
Bill King
4507d64345 tests: make compile 2010-12-03 11:14:01 +10:00
Alessandro Portale
1c18090b90 Fixing the generation of examples. 2010-11-18 15:37:33 +01:00
Alessandro Portale
f096b53b46 Fixing the generation of Qt Quick examples 2010-11-16 20:57:22 +01:00
Morten Engvoldsen
886a9736dc Updating QML examples list for deployment on device. 2010-11-16 18:03:06 +01:00
Alessandro Portale
3f366ef54b Valid XML attempt 2010-11-15 22:28:58 +01:00
Alessandro Portale
1b15ba8614 Mass Qt Quick App generator. 
First usage: convert QML examples into c++ projects.
 2010-11-15 22:15:48 +01:00
Christian Kamm
1920372280 Move ast dump tools from tests/manual to tests/tools. 
Reviewed-by: Friedemann Kleint
 2010-11-05 09:25:12 +01:00
Friedemann Kleint
338a349dff Debugger: Move tools out of tests/manual. into test/tools. 2010-11-04 13:45:42 +01:00