summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Also create .tar.xz source packagesEike Ziller2016-07-061-0/+1
| | | | | | Change-Id: I21959a06ca8f10b2622b5008c0d4af2c9a4da703 Reviewed-by: Helio Chissini de Castro <helio@kde.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add script to create a "dev" package, and allow building against itEike Ziller2016-05-201-0/+138
| | | | | | | | | | | | | Collects all the needed data from a source and build directory, which then can be used instead of a source directory in combination with an installed Qt Creator, to build plugins. On Windows and OS X the plugin can still only built in the same mode (release or debug) as the used Qt Creator install. Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Linux deployment: Only add RPATH to Qt if necessaryEike Ziller2016-05-131-9/+12
| | | | | | | | | Don't try to add an RPATH to Qt if the library/executable does not link to Qt. Chances are, that the reserved space for the RPATH is too short in that case. Change-Id: Ie8d50ede43d19236611fe56667995e58606062db Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Set execute permission on all scripts.Friedemann Kleint2016-04-075-0/+0
| | | | | Change-Id: I406665390406dca324c2c98dda37540b22a065df Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* packageIfw: Fix warningsEike Ziller2016-03-141-10/+10
| | | | | Change-Id: I3c8df19e1fb50e5d41413751f502cb5f7331bfc4 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Installer: Support different display version than component versionEike Ziller2016-03-141-3/+10
| | | | | | | | | | | The component version must be numeric, but we want to display e.g. Qt Creator 4.0.0-beta1 in the installer title. The change adds a -d parameter to the script and adds corresponding replacement variables. Display version falls back to component version. Change-Id: Ia8bcd05444e280f8a44ab321b043f4031725600d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Windows/deployqt: Only ship necessary version of EGL/GLES libsEike Ziller2016-03-071-1/+5
| | | | | | Task-number: QTCREATORBUG-8296 Change-Id: Idf27427715f3234c077466b623d32829577f13c7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* msvc2tasks.pl: Add support for clang-cl.exe and match errors, too.Friedemann Kleint2016-02-031-9/+32
| | | | | | | | | Move regexp filtering into subroutine for clarity. Task-number: QTCREATORBUG-15641 Task-number: QTBUG-50804 Change-Id: I2b78e82f41b83c64053b350b241f3c14246eb417 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* License change: Update makedmg.sh scriptTobias Hunger2016-01-201-2/+1
| | | | | Change-Id: I9068e57370a21d4567673ab8e3e4efb78a8561cb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to aggrement with Free Qt FoundationTobias Hunger2016-01-1920-154/+488
| | | | | | | | | * Make sure all scripts come with a license * Update the license in the scripts * Add scripts to help with license changes Change-Id: I38a25aa1287ee8a75e0f0307d1b30320d781ad1f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update License according to aggrement with Free Qt FoundationTobias Hunger2016-01-151-0/+207
| | | | | | | | | * Update license files in various places * Update the license template * Update README.md and appdata.xml Change-Id: I0ae9365b15364728165e79ba8ad86dfdd6cb9ddd Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Scripts: Fix deployqtChristian Stenger2015-11-111-1/+1
| | | | | | | | | | When comparing re.MatchObjects instead of real bools the objects normally aren't identical. This lead to filtering out all libraries and not copying anything to the respective directory. Change-Id: Ib17cc04d281620b142ac570475d8fdc4912eaa86 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Packaging: Fix deployment for Qt5.6Eike Ziller2015-11-032-23/+33
| | | | | | | | | | | | | | Qt 5.6 builds with relative RPATH by default on Linux. Since this additionally leads to very short RPATHs, we cannot change the relative structure within the Qt installation (e.g. plugins in bin/, libs somewhere in lib/qtcreator/). Instead we now deploy qt into a self-contained lib/Qt/ folder, keeping the original structure, on Linux. Change-Id: I36136590379c3e7b02ba7de3345369e2384dcc95 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Deployqt script: Stylistic changesEike Ziller2015-11-021-31/+20
| | | | | | | | | | | | | | | Pylint recommendations - filter -> list comprehension - whitespace fixes - unused import - unused variable - variable overriding builtin - missing exception types Also simplify copy-ignore-helper Change-Id: Ibf7c573af35d60937f23a85d7a52e20031f38c4b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add script for packaging a directory.Eike Ziller2015-10-233-68/+264
| | | | | | | | | | | Mostly 7zips the directory, all files must already be in place. On Linux the script also fixes the Qt related RPATHs. Changes the RPATH fixing to only change the Qt RPATH, instead of overwriting the complete RPATH to something custom. Change-Id: I1e07b7c0fcb4292197a4e743782a1392f6558747 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix deployment of qml2puppetEike Ziller2015-10-192-9/+17
| | | | | | | | | | | | The move to LIBEXEC_PATH broke running the puppet from the packages on Linux and OS X, because there it cannot find the platform plugin anymore. We need to add a qt.conf for it, and because Qt Creator.app/Contents/ Resources already contains the qt.conf for Qt Creator itself, the puppet must also move to its own subdirectory on OS X. Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Windows: Also deploy clang.exeEike Ziller2015-10-141-0/+2
| | | | | | | We need both clang.exe and clang-cl.exe for mingw and msvc Change-Id: I2f8883f2ac42636699d4326d4d5f044b34b7d9ba Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Allow packaging additional 7zips in the installerEike Ziller2015-10-091-10/+20
| | | | | Change-Id: I435602671ef5cde46580d4ca383930951765ebde Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-011-3/+3
|\ | | | | | | Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
| * Installer: Fix syntax for Python 3Orgad Shaneh2015-08-251-3/+3
| | | | | | | | | | Change-Id: I09a08f032b2cb774c0cf7d7290b9ab7e886137a2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-061-0/+150
|\ \ | |/ | | | | Change-Id: I1ce0fa92e5c469d591d3030d1a4f168dcee232ba
| * Clang: Add convenience script to check clang completionsNikolai Kosjar2015-08-051-0/+150
| | | | | | | | | | | | | | | | | | This one is useful for inspecting the completions we get from clang (e.g. for checking if the bug is in clang or in our code, or to compare the completions of different clang versions). Change-Id: If9dfe1b58a2b087ef6b92485e10ff272badf75c8 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
| * OS X: There is no qml(1)puppet anymore, so don't try to deploy itEike Ziller2015-07-141-6/+1
| | | | | | | | | | | | Change-Id: Ic3f3150e3295529082ca621ec27792b2d08caed1 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Linux: Deploy clang binaries to new libexec directoryEike Ziller2015-08-041-1/+1
| | | | | | | | | | | | | | | | moved from bin/ to libexec/ in master Change-Id: If6fd0b3241fbb62b09b163b6063a831c1bf592a4 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Follow-up fixes for the libexec path changeEike Ziller2015-07-151-7/+2
| | | | | | | | | | | | | | | | | | | | The fallback puppet must be found in libexecPath now. Deployment on OS X must also be adapted to the new location. Broke with 6d5a5aff9462b4253047f0ed2707ffa2e3497a19 Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-07-103-109/+30
|\ \ | |/
| * Deploy only the clang binary and its link targetEike Ziller2015-07-102-7/+16
| | | | | | | | | | | | | | | | | | Instead of all clang* which is too much on Windows (because they are copies instead of links), and we don't want clang-check on Linux and OS X either anyhow Change-Id: Ia08cf09efa5a23ec6b83bc5df18d09558810f72d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * OS X: Deploy clang binary for use by static analyzerEike Ziller2015-07-091-0/+2
| | | | | | | | | | Change-Id: I0047cb33e7267b84310307eb3bb0f6c0d6b31bc5 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Deploy clang binary for use by static analyzerEike Ziller2015-07-091-8/+16
| | | | | | | | | | Change-Id: Ia0ad96e18b754e2ac20a6dddd461d4d24c1a0db4 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Deployqt: Make Qt Quick 1 imports optionalEike Ziller2015-07-091-1/+3
| | | | | | | | | | | | | | | | Since we do not need Qt Quick 1 to compile Qt Creator anymore, and it is a separate component in Qt now Change-Id: I1bd35ceca7d4bd3261221a8607a35a658bc857e5 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Remove unused and outdated scriptEike Ziller2015-07-091-100/+0
| | | | | | | | | | | | Change-Id: Iaa3d2f5f415b2d74d12d5b1e269c97df848d25bf Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Use a proper libexec path for Unix builds.Christian Kandeler2015-07-091-0/+3
|/ | | | | | Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Linux: Fix deployment of libclangEike Ziller2015-06-231-5/+16
| | | | | | | | We need the versioned name of the library now, so copy all libclang.so* while keeping symlinks as symlinks. Change-Id: Ia2cc5e82be0848a3c9b0cb3055e150e6b1a151c9 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Cpaster frontend: Fix deploymentEike Ziller2015-06-231-1/+2
| | | | | | | | | | | | | On OS X we may not set QMAKE_RPATH because otherwise the default rpath to the Qt libs is removed. Install the tool on Windows and Linux. Add the plugins path to the rpath on Linux. Also make the rpath when building relative instead of absolute on Linux. Change-Id: Ieb6a79d9f9f922d117736ae7b4ae65c784ade5c9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* OS X: Fix deployment of toolsEike Ziller2015-06-231-4/+8
| | | | | | | | | - clangbackend missed deployment - Fixed libclang location to be in Frameworks, and deploy missing dylib link - Fixed deployment of buildoutputparser Change-Id: I2b1fbd552bd0da6fef154fe1b6dac0a53b320483 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Fix OpenGL on Linux with Qt 5.5Eike Ziller2015-06-051-1/+1
| | | | | | | The XCB platform plugin now needs a plugin for the OpenGL backend Change-Id: I5e7b296a0b645aec2a8d3ba80c53cb946e35e7f1 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* msvc2tasks.pl: Adapt to MSVC2015.Friedemann Kleint2015-05-221-1/+1
| | | | | | | | | The format of the compiler warnings changed: c:\foo.cpp(395) : warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) c:\foo.cpp(395): warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) Change-Id: Iaa04d8fedbb0a3da2802be1c860d54fefb7bfe5d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Run macdeployqt for the remaining auxiliary executables.Jake Petroules2015-05-181-0/+10
| | | | | | | | | This fixes broken library paths for buildoutputparser and qbs executables on OS X, making them unusable out of the box. Task-number: QTCREATORBUG-14432 Change-Id: I81c64f962b0a1eee2800da04b5202f5fd9efb706 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.3' into 3.4Eike Ziller2015-03-021-1/+2
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I897baf92970c540f4d64b6a726ce604791234b1a
| * OS X: Make deployment of clang lib less fragile.Eike Ziller2015-02-271-1/+2
| | | | | | | | | | | | | | | | | | Ensure that the correct rpath is added, even if we fail to remove the old one. Change-Id: I96e37d0e26b04f240300244aa93f434a60013410 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-125-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update LicenseEike Ziller2015-01-165-13/+13
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Scripts: Fix gathering of xml tag contentChristian Stenger2015-01-271-10/+14
| | | | | | | | | | | | | | | | If content was read partially the script stored only the last read part instead of the whole content. Change-Id: I331eacbd3a7321fabd32b8addec67ad01a722ed3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Add script to find ui visible string changesTobias Hunger2015-01-211-0/+222
|/ | | | | Change-Id: I685e65258078784acf9ce30703a8192bb1f8fd8a Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* OS X: Avoid running macdeployqt twice and add more deploy debug outputEike Ziller2014-10-281-10/+15
| | | | | Change-Id: I0d1c46fcf7b05fc6673f0eddbfcc95490a46c4cd Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* OS X: deployqtHelper: never deploy anyting twiceEike Ziller2014-10-271-29/+54
| | | | | | | | | | | | | | | | | | There are targets that have a "depends" on "deployqt", and since the Makefile doesn't know any specifics, the deployqtHelper script is run twice when calling e.g. make deployqt make codesign make dmg That results in the "make dmg" calling the helper script again, which overwrites for example the previously signed designer plugins with the unsigned original again, leading to code signature verification failure. This became only apparent since OS X 10.9 changed to always do deep verification of signatures. Change-Id: I36ec6de1a7d184800c59a3db47e01afedc0e6879 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-142-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License updateEike Ziller2014-10-092-2/+4
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-161-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
| * Scripts: Fix deployment of qmlpuppets on OSXv3.2.1Christian Stenger2014-09-121-2/+2
| | | | | | | | | | Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
View Lorry Controller Status