feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
45,745 Commits 108 Branches 368 Tags
ccda65bf838786b705a81d9dba602c2bc0d62242
Commit Graph

49 Commits

Author SHA1 Message Date
Jake Petroules
1c04cce4d7 Remove unnecessary /FS flag in qbs property provider. 
The current version of qbs handles this automatically.

Change-Id: I81905335fd3366198164436e7125944ad8a3d304
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-05-18 15:31:59 +00:00
Jake Petroules
ac9360a2c1 qbs: apply compiler and linker flags from GCC toolchains. 
Change-Id: I27ce0b11238a2a0c9e5f2f1f8d9e5ecfa3cc51f9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-05-18 09:17:33 +00:00
Joerg Bornemann
3c63b621d9 QbsProjectManager: Write MSVC compiler version to profile 
Change-Id: Ibd8c559ffecf327eee6af8e6d5fbacb5c8c863d1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-05-18 02:56:47 +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
Eike Ziller
c868b9f3ed Merge remote-tracking branch 'origin/3.5' 
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
 2015-09-04 09:19:28 +02:00
Christian Kandeler
d58002dd46 QbsProjectManager: Fix handling of cross-compilers on Windows. 
Task-number: QTCREATORBUG-15011
Change-Id: Iea84e1a545bc6f414a35602e1d0c8c903901e813
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-09-03 14:13:46 +00:00
Eike Ziller
37f6b4397d Merge remote-tracking branch 'origin/3.5' 
Change-Id: I1ce0fa92e5c469d591d3030d1a4f168dcee232ba
 2015-08-06 11:38:13 +02:00
Christian Kandeler
707d49d2fb QbsProjectManager: Un-break MSVC. 
Commit aad5ca12c4 was over-eager, wrongly assuming the presence of
cpp.cxxCompilerName for MSVC and also not taking into account that
we don't set cpp.compilerVersion* from Qt Creator.

Task-number: QBS-846
Change-Id: Id6a88c18f2c460ef66f0339aeb999b7fc0321225
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
 2015-08-06 07:49:04 +00:00
Eike Ziller
cd5f9f6ff8 Merge remote-tracking branch 'origin/3.5' 
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
 2015-08-04 13:16:03 +02:00
Jake Petroules
aad5ca12c4 Update qbs submodule and adapt QbsProjectManager accordingly. 
Change-Id: I29dc48b991fc04b599e60ae63a7f4b7978dc9f3d
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-07-31 06:42:21 +00:00
Jake Petroules
ffcb2e654e Qbs: generate correct architecture name for iOS armv7. 
Task-number: QBS-839
Change-Id: I535992feb2dd4db9f30dc1458b4c6a156a26849f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-07-30 08:57:34 +00:00
Jake Petroules
96278326d8 Qbs: Remove unnecessary header dependency. 
Change-Id: I9eb64d089c5b4f1f8c3560c87c053c80668fddc0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-07-28 20:22:45 +00:00
Tobias Hunger
c275dac084 Rename toolchain type constants in ProjectExplorer 
Change-Id: I56f5b7373846bb091456c050eb1ff3495ca2dd72
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-07-14 14:44:07 +00:00
Tobias Hunger
e6d1141e1e ToolChain: Get rid of type() in favor of typeId() 
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-07-14 14:40:03 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4' 
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
 2015-06-17 12:04:21 +02:00
Joerg Bornemann
f0467f8b01 support Visual Studio 2015 
Task-number: QTBUG-46344
Change-Id: I49c3e2776e65cc83d40d1f5ab3be1365d17242d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
 2015-06-15 11:53:37 +00:00
Tobias Hunger
5b77a3a8c1 Blackberry: Remove blackberry support 
Keep QNX.

A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.

I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.

Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 11:15:53 +00:00
Sergey Belyashov
bcbf0d8417 Fix toolchain detection when C compiler specified 
If someone specifies C compiler instead of C++ one, then
extractToolchainPrefix() returns an empty result which
causes invalid behaiour on build stage.

Task-number: QTCREATORBUG-14250
Change-Id: I94d2a281c6a98178c486019344c6cdc71ac50a49
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-16 13:36:53 +00:00
Christian Kandeler
e5784b6964 QbsProjectManager: Set cpp.compilerPathByLanguage. 
To work around the "-x" bug in icecream.

Change-Id: I7d95aa120ad344f6662c265fe81ab98752c7cd1e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-02-24 10:53:11 +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
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Christian Kandeler
ee45dc6db5 QbsProjectManager: Put internal classes into the Internal namespace. 
Change-Id: I5fa1ce2ed709b7904a0b2701133794751e5e2119
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-28 10:44:33 +01:00
Christian Kandeler
bdb9a14de0 QbsProjectManager: Allow users to override profile properties. 
Creator derives its qbs profiles from the kits and overwrites
them as it sees fit, which means users cannot set custom properties
by editing the respective settings files or using the normal
qbs command-line tools. Therefore, we need to provide them with
a way to do this from Creator itself. For this purpose, we
introduce a settings page where a user can add or override
qbs properties per kit. The resulting "diff" is then applied
whenever the profiles are written, so qbs will take the
custom properties into account.

Change-Id: I909f5243c65647f62c91a2afa242fd531ddaf915
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2014-11-10 11:05:11 +01:00
Jake Petroules
368b2acaf0 Qbs: set cpp.platformPath for OS X and iOS profiles. 
This is an (effectively) required property which is necessary to locate
a number of SDK tools.

Change-Id: Ia4912e383a053c7abcbd47715cf4b130c4fbafd6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
 2014-11-05 17:43:42 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02: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
Christian Kandeler
f865f7d8ac Update qbs submodule. 
And do the required adaptation in QbsProjectManager.

Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-10-07 14:02:45 +02:00
Jake Petroules
631ee70cc7 Qbs: refactor property provider. 
Set toolchain list centrally.

Set target OS for additional operating systems: WinRT, Windows CE,
Android, FreeBSD, NetBSD, OpenBSD, BSD (generic), BlackBerry, QNX,
and Solaris.

No more "else assumptions" which would for example detect Clang on
Windows as MSVC, any non-Clang toolchains as GCC, or any unrecognized
operating systems as Unix.

bsd4 is gone as it is not necessary in any practical sense (and no other
operating systems have different identifiers by version -- there is a
dedicated hostOSVersion property anyways).

Detect iOS without relying on Qt.

Change-Id: I38e2adf188d4604182ec84003dc5d281fce025cc
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-09-29 17:32:49 +02:00
Kai Koehne
e2584f69d4 Replace QLatin1String("x") with QLatin1Char('x') where possible 
Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-04 14:50:00 +02:00
Christian Kandeler
49ae97662d QbsProjectManager: Make DefaultPropertyProvider a bit more readable. 
- Decrease indentation by exiting early.
- Use switch instead of "else if".

Change-Id: I74e73e087f64c16f01497854c67f581ef79aff3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-08-20 15:28:54 +02:00
Christian Kandeler
023e17009e QbsProjectManager: Fix linker name for MSVC. 
As opposed to gcc, we can't just invoke the compiler binary for linking.

Task-number: QTCREATORBUG-12824
Change-Id: Icdf8b7217b14976a7a4249b5d0c5cc5f76ffdd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-08-12 17:49:20 +02:00
Christian Kandeler
c4e22ddaf1 QbsProjectManager: Use the right linker command. 
Task-number: QTCREATORBUG-12808
Change-Id: I28e7544d80779e5f2a8b6fa3156af8292a9d1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-08-08 16:26:58 +02:00
Christian Stenger
ebd8cc314b QbsProjectManager: Fix compile 
Change-Id: I532412928e0c58da63783d79038939564342cea7
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
 2014-07-25 08:34:54 +02:00
Jake Petroules
4d24a16059 Qbs: Set cpp.xcodeSdkName and cpp.xcodeSdkVersion. 
Change-Id: I17ef8c60589208810e9427187249b7a56c46b623
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-24 21:05:52 +02:00
Tobias Hunger
089e690108 Abi: Remove endianness from ABI 
The functionality is not implemented properly, remove it before
someone thinks it was.

Change-Id: I6e9c423a6b84a4a5fcf4d817e14df97fbdc901c5
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-24 10:28:07 +02:00
Jake Petroules
5811eeedfa Qbs: Un-break support for Itanium and PowerPC. 
Appending _64 to the arch name for 64-bit ABIs is insufficient, and this
is now properly handled for all architectures currently recognized by
Qbs, and hopefully future-proofed as well.

Change-Id: I56fcfdcfd065ed5231fed3a817a55b9af9c82fc9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-07-22 12:16:14 +02:00
Jake Petroules
e4fa0a9e5d Qbs: Allow differentiation between little and unknown endianness. 
Change-Id: Iaa1f13ba0086fa36fe581d81f63e84f0918ebb7e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-07-21 19:09:15 +02:00
Jake Petroules
ede39afa8a Qbs: Clean up targetOS calculation for Darwin OSes. 
iOS Simulator is now detected correctly instead of making assumptions
based on the architecture that could change in the future (ARM-based
Macs, anyone?).

Change-Id: I6cc78aedf86af3623363d67203fcbc086f0cb6f8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-07-21 19:08:56 +02:00
Joerg Bornemann
39ae35cd81 Qbs: write toolchainPrefix to qbs profile 
Task-number: QTCREATORBUG-12133
Change-Id: I9d68c9900b7f701b788953fae334b581d7127386
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-04-28 12:11:23 +02:00
Yuchen Deng
3cb00e1afe Add /FS to cpp.platformC(xx)Flags for MSVC2013 
Task-number: QTCREATORBUG-11025
Change-Id: Ibdfebc601a38535aae353a0ed2aedac920d5b192
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-04-22 10:24:44 +02:00
Christian Kandeler
eaf75253b4 Update qbs submodule to HEAD of master branch. 
Includes some necessary adaptations to the QbsProjectManager plugin,
namely:
    - Use the new library for setting up Qt profiles.
    - Use per-profile preferences.

Change-Id: I0a639bd291d790c6da9cb4ade53841314310d5ef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-21 17:25:00 +01: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
Fawzi Mohamed
925ace38ea qbs: fix ios profiles 
Task-number: QBS-427
Change-Id: I2ad69076ba8fe4c989f6909b77087c94def683cb
Reviewed-by: Ivan Komissarov <ABBAPOH@me.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-06 14:15:02 +01:00
Christian Kandeler
97f5b31cc0 QbsProjectManager: Support generic Unix targets. 
The profiles that we currently create do not work with any non-Linux,
non-Mac Unix system.
Note: This patch introduces some additional redundancy to keep the risk
close to zero. Clean-up can be done later in a non-frozen branch.

Task-number: QTCREATORBUG-10968
Change-Id: I4e150d641a726826b8f3bae4b4a25d80c51f08c9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-04 10:26:31 +01:00
Joerg Bornemann
22de213ab6 round OS X targetOS property off 
The complete value for OS X is ["osx", "darwin", "bsd4", "bsd", "unix"]

Change-Id: Ib0f08e1dfb4ef2ce6e23eeffbfa054fe01b629cf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-11-22 12:41:46 +01:00
Jake Petroules
479aa2dc28 Export CONFIG and QT_CONFIG from qconfig.pri to QBS. 
Task-number: QBS-397
Change-Id: I9b29781e752176d0cf71221b896a6ac017538c7b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-14 10:38:38 +02:00
Jake Petroules
be0022d495 Export Qt plugin path to QBS configuration. 
Change-Id: I14c4315b6a5029723c2940c05160551361b91dd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-26 14:16:00 +02:00
BogDan Vatra
92a5402f65 Make QBS setings constants accessible for other plugins. 
Change-Id: I7e66136d2b75a932b981713ccc27e3e69fd44baa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-19 15:28:57 +02:00
Tobias Hunger
f17bdffb11 Qbs: Let plugins extend the profiles written into qbs.conf 
Provide a way for plugins to extend the profiles that Creator
will write into the Qbs configuration.

This should allow e.g. the Android plugin to add customized settings.

Change-Id: I0de596e2c922280b953c43ea0651b08b8936234c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-07-18 14:51:44 +02:00