summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-031-11/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/coreplugin/editormanager/editormanager.cpp src/plugins/cppeditor/cppeditor.cpp src/plugins/remotelinux/remotelinuxdebugsupport.cpp src/plugins/texteditor/basetexteditor.cpp Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
| * Fix the clang deployment fixEike Ziller2014-08-281-1/+1
| | | | | | | | | | | | | | it needs a / at the end ... Change-Id: I546d70bf8e1d70ca3e08e3d563e427a96ad73209 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Fix deployment of clang libraryEike Ziller2014-08-271-1/+1
| | | | | | | | | | | | | | | | Since the plugins moved in 6aad96d89b5cd4f8b7e06b72cf911054c5d89037, the rpath of the clang code model plugin was broken for deployed clang library. Change-Id: I5d59390540918c73a2cd217bb5ebf8f947122f01 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| * OSX: Fix deployment of qml puppetsEike Ziller2014-08-221-10/+4
| | | | | | | | | | | | | | They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-1/+1
|/ | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* ios: fix deploy script for iossim_1_8_2Fawzi Mohamed2014-07-291-0/+1
| | | | | | | | | | iossim_1_8_2 (the tool used to deploy to the simulator with Xcode <=5.0.x) wasen't being "qtdeployed", and had incorrect library paths. This made deploy to simulator fail on older Xcode installations. Task-number: QTCREATORBUG-12753 Change-Id: Iecae2938daa0f7180c1fa576c62dd519ac7846d5 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix deployment of clang code model plugin.Eike Ziller2014-07-151-2/+2
| | | | | | | Broke with the removal of the QtProject subdir for plugins Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* A bit more status output for the source package creation scriptEike Ziller2014-07-091-0/+1
| | | | | Change-Id: I35c89cbf3c59972fcec3377fceb0ef688d6779e4 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Scripts: Adjust dependency checker to new plugins structureChristian Stenger2014-05-271-6/+4
| | | | | Change-Id: If9fb1309335e61e9133ece8fd12c8033a447d6b4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Cleanup whitespaceOrgad Shaneh2014-05-161-2/+2
| | | | | | | Mostly trailing whitespace Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add qdoc2tasks.pl for converting qdoc warning logs into .tasks files.Friedemann Kleint2014-03-251-0/+26
| | | | | | Change-Id: Ia8f481b1473a2194d87cf7df00966917c3a4e341 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Deploy Qt platformthemes plugins with Qt CreatorKai Koehne2014-03-201-1/+1
| | | | | | | | | Makes sure Qt Creator integrates nicely e.g. with gtk. Task-number: QTCREATORBUG-11406 Change-Id: I4da11b42e9d407ee8456c6d43479839667ee13c1 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Win/Lin deployqt: fix check for LLVM_INSTALL_DIREike Ziller2014-02-121-1/+1
| | | | | | | | os.environ["LLVM_INSTALL_DIR"] throws an exception if the key is not in the dictionary. Change-Id: I0e9dc9dbaf5612db3c530a436161211b6f0351af Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clang/Mac: also deploy the header resources.Eike Ziller2014-02-121-0/+1
| | | | | Change-Id: I0c7abe70dd45216d15a9a62d87c0fda8105cf9a8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Lin/Win: Deploy libclang and resources if neededEike Ziller2014-02-111-0/+21
| | | | | Change-Id: I4393a3e955e3810eea79221233c82c80a9de119e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Don't fail with error if deployqt is called multiple timesEike Ziller2014-02-041-2/+4
| | | | | Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Deploy libclang if neededEike Ziller2014-02-041-0/+11
| | | | | Change-Id: Ia60d4bc3fd8899da51e3c71ef6a514fb3f52f1e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add gcc2tasks.pl for converting GCC warning logs into .tasks files.Friedemann Kleint2014-01-211-0/+26
| | | | | Change-Id: I408d2170575c99a690af53d32b08318e6060f525 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add msvc2tasks.pl for converting MSVC warning logs into .tasks files.Friedemann Kleint2014-01-211-0/+27
| | | | | Change-Id: Ief673c06f0456fe1055447383c9fbef5a112d69c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add purify2tasks.pl for converting Rational Purify logs into .tasks files.Friedemann Kleint2014-01-201-0/+32
| | | | | | Change-Id: I2fcaa0149fb6fbe65a8a0041823abe5c86db3bba Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Make good for missing year updateRobert Loehning2014-01-081-1/+1
| | | | | Change-Id: I4d100538e05e2669908df5b0a0cc2156da181863 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-084-4/+4
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* New file name convention for source packages.Eike Ziller2013-12-021-5/+6
| | | | | | Change-Id: I6ec2744379751708bbd1f36816dba7e5b976270d Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Fix size of disk image in the hope of avoiding resize problemEike Ziller2013-10-091-1/+1
| | | | | | | diskimages-helper: resize request is above maximum size allowed. Change-Id: I6cc8da465d99fdb971d5e66090163464c85ccec1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mac: Try to work around the re-occurring disk image creation errorEike Ziller2013-10-081-1/+3
| | | | | | | | | | | A guess is that hdiutil finishes even though the system is not yet quite finished with the image (e.g. still unmounting?), so introducing a small timer. Also turn on verbosity, so this error might be better trackable if it occurs again. Change-Id: I0acb23bbac408f2979c8cacf2fc58fdff782fc3d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Ios: Move tools to <libexec>/ios, make them lowercase, fix deploymentEike Ziller2013-10-071-1/+7
| | | | | | | | They can't be directly in libexec path, because then they couldn't have their own qt.conf for resolving the Cocoa platform plugin. Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix deploying Qt on Mac (qt quick imports)Eike Ziller2013-09-261-5/+11
| | | | | | | | | | | Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt Quick 2 imports. Also make qmlpuppet (Qt Quick 1) optional for deploying Qt. Task-number: QTBUG-33545 Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* The script for creating source packages no longer creates doc packageEike Ziller2013-06-201-0/+0
| | | | | | | Reflect that in the name Change-Id: I8c7f81b0ff3b24e63401c6bbb90c9ad622c6ed0d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add qbs sources to source packages.Eike Ziller2013-06-201-14/+24
| | | | | | Change-Id: Iee20c93bca26a0e9849e88e14605f1703347e331 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make it possible to build Qt Creator installers on Mac tooEike Ziller2013-06-192-2/+2
| | | | | Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* dependencyInfo script: List library dependenciesTobias Hunger2013-05-281-0/+7
| | | | | Change-Id: If595bccab1ebc16d894cf703cccedd7957b78edc Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-231-1/+1
|\
| * Deploy also platforminputcontext pluginsKai Koehne2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | This is required at least with Qt 5.1 / Linux. Task-number: QTCREATORBUG-8471 Change-Id: I7342193ef40fcc1a3e523d787c7521d6e810cd61 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Plugin dependency checker scriptTobias Hunger2013-05-221-0/+257
| | | | | | | | | | Change-Id: Icf83c978cd576e0d23e5183d688ef0c96210d484 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge branch '2.7'Oswald Buddenhagen2013-05-151-5/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qtquick/qtquick-components.qdoc doc/src/qtquick/qtquick-designer.qdoc qtcreator.pri qtcreator.qbs src/plugins/cppeditor/cppinsertdecldef.cpp src/plugins/qnx/qnxruncontrolfactory.cpp Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
| * Fix deployqt for qt4Eike Ziller2013-05-031-5/+6
| | | | | | | | | | | | | | Don't try to deploy qt quick 2 imports if they aren't there. Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Deploy qtquick2 imports for qml2puppet.Eike Ziller2013-05-031-5/+15
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9235 Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-4/+24
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * Mac: Deploy and patch qml imports and qml2puppetEike Ziller2013-04-301-4/+24
| | | | | | | | | | | | | | | | | | | | The patching of imports and plugins is done automatically by macdeployqt, we need to pass it the qml2puppet executable though. Also add Qml2Imports to the qml(2)puppet's qt.conf. Task-number: QTCREATORBUG-9136 Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Use .run for standalone packages.Eike Ziller2013-03-251-1/+1
|/ | | | | | | | Usually defines the file as "to be run if possible" by Linux file browsers. Change-Id: I8c0e63df493e1e3e65be0a392841fbb11ff163b9 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Try to workaround issue when creating Mac dmg imageEike Ziller2013-03-151-1/+1
| | | | | | | | | | Sometimes one would get an error "hdiutil: resize request is above maximum size allowed." which might have to do with autostretch limits. Passing the -stretch argument with a sufficiently large size should make resizing succeed. Change-Id: I3103ce38e809c2429bed6847ead03f28bfa1f54a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Create source zip with windows line endings.Eike Ziller2013-03-111-9/+21
| | | | | | | | The used method is similar to what is done for Qt5 Task-number: QTCREATORBUG-8651 Change-Id: I6ac58b4410c03d3f650df04f4fb5425dcfe5e03b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Deploy codec plugins on Lin/Win.Eike Ziller2013-02-271-1/+1
| | | | | | | | Task-number: QTCREATORBUG-8830 Change-Id: I3d2d917fc58dc3f62277ac4072b7dc2894fb7cd4 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-294-4/+4
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
View Lorry Controller Status