feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,675 Commits 108 Branches 368 Tags
284f7dfb2f37424d91b6274128120af224442861
Commit Graph

32 Commits

Author SHA1 Message Date
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
Felix Geyer
28b920ecd4 Fix qreal is not double. 
Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 3b0f26e231)
 2011-11-09 11:00:13 +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
Daniel Molkentin
49b5556921 Refactor: Move NAM to utils, rss model to welcome. 
Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 08:30:58 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
7915ce6bd3 Show wrap indicator also for searches in help views. 
Task-number: QTCREATORBUG-2753
 2011-01-14 11:19:57 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
kh1
d8035bcaca In case of network error print the error string. 
Task-number: QTCREATORBUG-3378
 2011-01-11 16:12:06 +01:00
kh1
80cd57a9b1 Small cleanup. 2011-01-11 16:12:06 +01:00
kh1
fd89e85850 Fix missing progress indicator during load. 
Task-number: QTCREATORBUG-3380
 2011-01-11 13:16:12 +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
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
kh1
0985f9c1c4 Fix ambiguity with help manager by renaming the file to match class. 
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
 2010-11-16 16:25:55 +01:00
kh1
b4dd2080be Implement opening find toolbar after '/' as requested by hjk. 2010-09-22 15:33:50 +02:00
kh1
6c580fd71b Make sure we can open local files as well. 
Reviewed-by: ck
 2010-08-16 15:21:58 +02:00
Thiago Macieira
25433ca87c Fix compilation with Intel CC: Q_UNUSED takes a reference 
in qglobal.h, we make Q_UNUSED call a template function that takes T&
as a parameter. So we can't pass an rvalue (the result of the &&
operator).

Reviewed-By: Trust Me
 2010-08-11 21:13:44 +02:00
con
cecf9ac25a Move find flags from IFindSupport to more accessible place. 
For later use in IFindFilter.
 2010-07-15 16:42:31 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
kh1
27daa542d3 We need to check for http only. 2010-06-14 16:57:52 +02:00
kh1
7d4bbf4934 Allow http request to be opened in the help plugin. 
Reviewed-by: ck
 2010-06-14 14:34:32 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
kh1
284fc63236 Backport some Qt Assistant print fixes. 
Reviewed-by: ck
 2010-06-01 13:15:07 +02:00
kh1
b0f9b1d491 We need to check for namespace nokia too. 
Reviewed-by: ck
 2010-04-28 15:07:05 +02:00
kh1
d086f76038 Improved workaround for new qt documentation, base on dboddie's work. 
Make the check more generic, to also work for all other Qt namespaces
than qt.ver.s.ion. Still there's something broken in Qt webkit or so.

Reviewed-by: ck
 2010-04-23 12:20:21 +02:00
kh1
342e621253 Quick fix to make the documentation work, needs a proper solution though. 
Reviewed-by: kh
 2010-04-19 19:08:51 +02:00
Oswald Buddenhagen
7400513695 fix compile with gcc: namespace friend class declaration 2010-03-30 18:40:35 +02:00
kh1
a8801d15c5 Implement text highlight support after full text search. 2010-03-30 17:51:45 +02:00
kh1
6ea66ca3bd Implement a common interface for help viewers. 
Both implementations are now split into two source files, based on the
base class type. They share also a commen implementation, but the class
interface looks now clean to the outside. Adopt other classes for use.
 2010-03-30 17:51:44 +02:00