Commit Graph

31 Commits

Author SHA1 Message Date
Tobias Hunger
fb21b78444 Autotools: Introduce AutotoolsBuildSystem
Introduce AutotoolsBuildSystem and slim down AutotoolsProject.

Change-Id: I68296152f9ecd5d14198c8d0b36a06c2d1b162ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-29 07:28:26 +00:00
Eike Ziller
d07d75a08a Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
	qtcreator.pri

Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
2019-02-08 12:44:49 +01:00
Raoul Hecky
06ff4c6c05 Fix include paths with subfolder
When an autotools project is using SUBDIRS it starts a new parser. The
new parser object was not propagating includes/defines/flags to the main
parser object, and thus the code model did miss those.
This commit fixes that.

Task-number: QTCREATORBUG-21618
Change-Id: I19ed4dd3820257378e888f3c4935ebd30e958828
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-07 09:16:27 +00:00
Alessandro Portale
adf5305af6 AutotoolsProjectManager: Modernize
modernize-use-nullptr
modernize-use-override
modernize-use-auto

Change-Id: I7abab567a6dab1bde93c520aa8746380ae24fda8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-04 18:24:31 +00:00
Marco Bubke
b6e12f4a1c Convert macros from plain QByteArray to a vector of structs
The old code model expected the macros as C++ formatted text
("#define Foo 42) but newer targets like the Clang codemodel expect key
value arguments like "-DFoo=42". So instead of parsing the text again and
again we use an abstract data description.

Task-number: QTCREATORBUG-17915
Change-Id: I0179fd13c48a581e91ee79bba9d42d501c26f19f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-14 15:23:56 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Tobias Hunger
063b9775a9 Autotools: Modernize
* Use pragma once
* Make sure overrides are everywhere
* Clean up code here and there
* Remove useless code from initializer lists

Change-Id: I9c285a803ea36cb32d14b3335757fd4b57f27d02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-04 10:44:54 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Tobias Hunger
82e319b2b0 AutoTools: Handle line continuations
Change-Id: I35fa309d7796f57ff64ce85d9f484aa2d8e900bd
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-07-09 14:00:00 +00:00
Tobias Hunger
3c84660ac4 AutoTools: Improve parsing of CPPFLAGS
Change-Id: I55019b37a883fca7241aa27bf27e45b03c4262c2
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-07-09 12:11:16 +00:00
Tobias Hunger
bc7ef69363 AutoTools: Handle "-I /some/path" as well as "-I/some/path"
Do the same for -D and -U.

Change-Id: I66ea3c03a58e59602e70f6eb39c471cdf063b456
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-09 10:48:07 +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
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