feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,234 Commits 108 Branches 368 Tags
a06da47d5b74f9d680b2201e218c1df87f023faa
Commit Graph

43 Commits

Author SHA1 Message Date
Tobias Hunger
6a4e4cfb25 GLSLEditor: Remove needlessly exported symbols 
... and move code into Internal namespace.

Change-Id: I02a90c33db0ffe574af43bdb8d8e37b4159f8f0f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-26 16:25:35 +02: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
hjk
d973448f74 GSLSEditor: Fully qualify class name in Q_EXPORT_PLUGIN 
Change-Id: I10c127852aa65958497d2b48af1d52c6a33c57ab
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-31 10:43:34 +01:00
hjk
6c4c45ba0e De-noise GLSLEditorPlugin 
Change-Id: Iaf846c387caed2b6636e5b057dce0b685d07012d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-30 20:24:22 +01:00
Orgad Shaneh
2ea3b2343d GLSLEditor: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: I88114509d972c498c3891c45d5e1f9b7fc9d3f3f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-11-27 08:55:50 +01: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
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...) 
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-05 15:19:30 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup. 
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-25 10:08:24 +02:00
Thiago Macieira
ca4a5e7f03 Fix the rest of the warnings about integer sign change with ICC 
None of these change the code in any way. The solutions applied are:
 - change the type to a more appropriate one, if possible
 - use ~0 instead of -1 when flags were intended
 - cast a -1 to the proper type otherwise

Change-Id: Ifcc125528f32b8c8f9ab20bea103e2a693045bf8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-22 18:51:32 +02: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
Eike Ziller
dc0b11db17 Don't parse GLSL init files at startup. 
Can easily be done when they are actually requested.

Change-Id: I2022b2b97ea13725ed62ed2657f99cb505553c45
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-02-03 13:03:39 +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
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +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
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +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
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
Leandro Melo
bec4f02495 New code assist API 
This is a re-work of our completion engine. Primary goals are:

- Allow the computation to run in a separate thread so the GUI is not locked.
- Support a model-based approach. QStrings are still needed (filtering, etc), but
internal structures are free to use more efficient representations.
- Unifiy all kinds of *assist* into a more reusable and extensible framework.
- Remove unnecessary dependencies on the text editor so we have more generic
and easily "plugable" components (still things to be resolved).
 2011-05-18 10:46:20 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
hjk
ed5f80048a completion: call directly from base text editor 
Reviewed-by: con
 2011-02-21 14:46:06 +01:00
hjk
9a6c4a42f7 completion: enable multiple completors for different use cases. 
Introduce CompletionPolicy enum, use 'TextCompletion' for the new plain
text completion, and 'SemanticCompletion' or 'QuickFixCompletion' for
the existing cases.

Reviewed-by: Erik Verbruggen
 2011-02-21 14:04:43 +01:00
Friedemann Kleint
88ba702293 L10n: tr()-Fixes for 2.2 2011-02-15 16:05:52 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +01:00
con
4321e01efb Some API beautification in action container. 
Done-with: Daniel Molkentin
 2010-12-17 16:05:47 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Rhys Weatherley
85aa32dfca Detect GLSL vs GLSL/ES based on mime type 
*.vert and *.frag are now for desktop shaders
*.vsh and *.fsh are now for ES shaders
File/New gives the user the choice which to create
 2010-12-01 10:25:23 +10:00
Rhys Weatherley
614127a557 Use the GLSL/ES system library by default. 2010-11-29 10:09:22 +10:00
Roberto Raggi
1bf87c67aa Initialize the shaders 2010-11-26 15:15:42 +01:00
Roberto Raggi
bc982796df Load the shader intializers. 2010-11-26 14:26:07 +01:00
Roberto Raggi
59c5359213 Show tooltips with the error messages. 2010-11-26 11:17:30 +01:00
Rhys Weatherley
2cd3ba8cb2 Fix the icon for the GLSL mime type 2010-11-25 12:46:26 +10:00
Rhys Weatherley
03355c49d8 Add GLSL file types to the File->New wizard 2010-11-24 13:27:53 +10:00
Roberto Raggi
c0a0c61050 Initial work on the code completion for GLSL files. 2010-11-12 17:13:43 +01:00
con
ff2dc588b7 Don't show GLSL or QML tools menus while they don't offer anything 2010-11-12 13:48:03 +01:00
Roberto Raggi
f6eeed0372 Initial import of the GLSL editor plug-in. 2010-11-10 15:46:41 +01:00