feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
41,789 Commits 108 Branches 368 Tags
0e7e521a0aa4054946725f27dba13c1eab50c63e
Commit Graph

20 Commits

Author SHA1 Message Date
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
Montel Laurent
0df6780176 Convert to new connect api 
Change-Id: I80aad51340bcde953763dec36cf989d6e19d4cd0
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-30 09:40:20 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Sergey Shambir
7688754b37 Autotools: added parsing defines and C/C++ flags from Makefile 
Change-Id: I7443ba3ada97e4abac5560bb5399ec96e065acee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-14 16:39:22 +02:00
Sergey Shambir
23fd6730fa Autotools: fixed crash in Debug build 
Method parseIdentifierBeforeAssign attempts to read null-terminating
symbol after end in some cases, it triggers assertion.

Change-Id: I1a4bc9ef290d2f09e7f9052f14466bacf957fe7a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-05 12:49:06 +01:00
Sergey Shambir
68aeaa5fc4 Autotools: fixed parsing var assignment without space before = 
Parser worked correctly with 'bin_PROGRAMS =', but failed on
'bin_PROGRAMS='. To reproduce problem on Ubuntu, perform 'apt-get source
gentoo' and open Makefile.am in downloaded folder as project: it will be
empty before this change.

Change-Id: I71d0866a2b9d8228ad5ac9237fa34be14b9e9b38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-08 13:16:08 +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
Mathias Hasselmann
29a2413d42 autotools: Plug small memory leak 
Change-Id: I04762208ad5cc96585a8ffdd48fe2c49670f00a0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-08 12:12:21 +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
Mathias Hasselmann
6caf58c0f0 autotools: Skip empty parts in target lists 
AFAIR this was about automake variables declared like this:

	bin_PROGRAMS = \
		foo \
		bar

Change-Id: Ic48b782cc65ca3489f4b9f7ea439ff3e3531e36a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-20 11:32:13 +02:00
Friedemann Kleint
f1e7fcf64a Clean up includes in autotools-plugin. 
Fixing an lupdate warning about cyclic dependencies of
autotoolsbuildsettingswidget.h.

Change-Id: I0e1c721df2c5f70ae9de38dd9bc5a34b63622ba7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-07-25 10:39:39 +02:00
Oswald Buddenhagen
6b8167c663 Merge remote-tracking branch 'origin/2.5' 2012-04-16 10:03:48 +02:00
Victor Ostashevsky
574d871e77 Fix file descriptor and memory leak in autotools plugin 
Don't create QFile's on heap when not needed.
Don't forget to delete those which have to created on heap.

Change-Id: I0e23e0d926febbfd464b3ff5d3e29fd46c16cb44
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Peter Penz <peter.penz19@gmail.com>
 2012-04-15 20:26:54 +02:00
Friedemann Kleint
42625ec3d2 Compile autotools-plugin with QT_NO_CAST_FROM_ASCII. 
Change-Id: If8928c5d2d878339aa3a7808655f8125e0a012cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-03 14:42:56 +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
Friedemann Kleint
27211de083 Minor Krazy cleanup in autotools. 
Change-Id: I1d955f2b2d6f6f2668156e0f211df37616cfc3e7
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 15:59:40 +01:00
hjk
93a4237602 autotools: minor cleanup 
Change-Id: Ic7862a4a97e60ed016a53f5893e03e3f9ec11e53
Reviewed-by: Patricia Santana Cruz <patriciasc@openismus.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 15:34:37 +01:00
Patricia Santana Cruz
6445c99ad2 Add AutotoolsProjectManager plugin 
Change-Id: Icbc8d105a3ffea2bf705d18e3413f6b3487ccfd3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-30 14:16:12 +01:00