summaryrefslogtreecommitdiff
path: root/src/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt Creator executable installation for qbs.Christian Kandeler2015-12-071-4/+8
| | | | | | | Commit 59ac67c0bb broke this for non-OS X. Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Fix missing application icon in Qt Creator qmake build.Jake Petroules2015-11-201-3/+3
| | | | | | | Task-number: QTCREATORBUG-15260 Change-Id: I60bb8c455e708d377828801377c4fee43e654dcb Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-11-121-6/+26
|\ | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/editormanager/editormanager.cpp Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
| * app: Use HighDPI application attribute instead of environment variable.Friedemann Kleint2015-11-101-6/+4
| | | | | | | | | | | | | | | | | | | | Set Qt::AA_EnableHighDpiScaling introduced in Qt 5.6. Amend change f4e5210cda6e2db35a832fa9ad80e975ec06bc7b which apparently was broken by qtbase:add58edcdbd986e68cdd65a2a935b76d85d5b639. Change-Id: I0a9337f17b02704e36915f78b1321287e4112378 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| * app: Setting HighDPI environment variablesAlessandro Portale2015-11-041-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After b42bd585c4d3a6c86efb5bc5ee0ec9f00a239dcf there was no automatic scaling of Qt Creator's UI with Qt 5.6 on non-OSX, anymore. This commit re-introduces it for Windows. As a small bonus, now the environment variable is only set during QApplication creation and unset afterwards. The run environments are now not affected, anymore. Change-Id: If0039df500d28a93c1ca8c2df9960992a010723f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Fix qbs build for non-OS X platforms.Christian Kandeler2015-11-041-3/+7
| | | | | | | | | | Change-Id: Iaa9a3d7ae713347b028e9414cff6028b957300c7 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Use IDE_DATA_PATHEike Ziller2015-10-291-2/+2
| | | | | | | | | | | | | | We have a variable for it, so use it Change-Id: I0985c7540fc0589abe9532ad1f2a590134fa5195 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-10-261-48/+34
|\ \ | |/ | | | | Change-Id: Iddfa0d2f3c0fb8ba65c0e5d479ad8e2f2cb95685
| * Main: Replace preprocessor directives with HostOsInfoOrgad Shaneh2015-10-141-48/+34
| | | | | | | | | | Change-Id: I5d72f159baa9a6b22bcb626e55ddf6de7724d4fc Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Qbs: properly install Info.plist, PkgInfo, and app icon.Jake Petroules2015-10-2137-13/+105
|/ | | | | | | | | The icns files have also been moved into an asset catalog because "source code" as a rule should be stored in the preferred form of modification. Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-301-2/+0
|\ | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
| * Revert "Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6."Thiago Macieira2015-09-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 85e1b4d0896465b825f561330a66e5bfd3928087. Setting that environment variable breaks the UI completely for certain environments. If Qt itself doesn't enable auto scaling by default, neither should Creator (for good reason, as it apparently doesn't work yet on X11). Worse, Qt Creator must respect the environment settings set by the user, never override it. This commit was unconditionally setting the auto scaling, making it impossible for me to override the settings. Task-number: QTCREATORBUG-15115 Change-Id: I42e7ef1a481840699a8dffff140857f6c0b33713 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Use variables for install locationsEike Ziller2015-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | Define variables in qtcreator.pri for the various install locations, instead of hardcoding the paths everywhere where they are needed. Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-011-2/+6
|\ \ | |/ | | | | Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
| * Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6.Friedemann Kleint2015-08-261-0/+2
| | | | | | | | | | | | | | | | | | Amends de3b2b6493c810380e961bb8b36b805a505b55b7 to set the variable. Change-Id: I305e0d911e42f76ee6f93406c012000a63bf7bc5 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Unbreak user-installed plugin loading on non-LinuxEike Ziller2015-08-241-2/+4
| | | | | | | | | | | | | | | | | | There is no "data" subdirectory on Windows and OS X. Broke in 1d5091e48f6df341dbd4436843c25afe25cbf4ce Change-Id: I1c5e5b60847028c9f3d734eeb6995e99013162b1 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Qbs: Adapt rpath handling to how it is normally implemented on OS X.Jake Petroules2015-08-211-1/+1
|/ | | | | | | | | | | | | | | | | When using rpaths on OS X, the install name prefix should always be set to "@rpath" and the rpaths should be appropriately set to the locations in which that binary looks for its dependencies. While this change is behaviorally identical, it brings the project setup in line with how developers expect these properties to be set, and thus reduces confusion. As an aside, it now correctly follows the principle of relocatability (install name prefixes like @rpath/Frameworks are only partially relocatable as opposed to @rpath alone which is fully relocatable). Change-Id: I7b5cc7a316d2608037ea9ab087029baa85aee2ba Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Limit legacy Highdpi tweaks to Qt versions < 5.6.Friedemann Kleint2015-08-191-0/+3
| | | | | | | | | | As of Qt 5.6, Qt will scale automatically. The font hinting issues on non-Windows OS should also be fixed. This silences the warning about using the legacy QT_DEVICE_PIXEL_RATIO variable. Change-Id: Icc78d990fae67bbd39a57fa1f5b08c592dc9e2ce Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Fix application install dir for OS X.Christian Kandeler2015-08-051-1/+1
| | | | | | | | The "Qt Creator" executable was put into the root dir instead of "Qt Creator.app/Contents/MacOS". Change-Id: Id353812076e36928d650f5cc3e6968f60c68d64b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* PNG: Run pngcrush on images with iCCP or sRGB profilesTobias Hunger2015-07-037-0/+0
| | | | | | | | This quietens warnings from libPNG during startup and shrinks the image sizes. Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Use RAII for crash handler setup/cleanupNikolai Kosjar2015-06-101-4/+2
| | | | | Change-Id: I71205c45ee01eeaf1d2c991ec625f6a66be1e851 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Do not build main application with testlibOrgad Shaneh2015-06-081-0/+1
| | | | | | | | | Passing TEST=1 to qmake makes the application run in console. There are no tests in main.cpp anyway. Change-Id: Ia5d1e02feb38e635f48169cc47d45738e4556f79 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Startup: Limit devicePixelRatio tweaking to WindowsAlessandro Portale2015-06-041-2/+5
| | | | | | | | | | | | | Setting DEVICE_PIXEL_RATIO on Linux to "auto" will disable font hinting even on systems with a DPR of 1. This patch limits our tweak to Windows. On OSX, it works reliably, anyways. Task-number: QTCREATORBUG-14516 Change-Id: I3c22c264c7f5019d22e1e3692b6d94c1d0777fc6 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Automatically choose device pixel ratioEike Ziller2015-04-201-0/+8
| | | | | | | Change-Id: Ic595ee0f45b7d3ec22b4c4086c0c6785b41c21f4 Task-number: QTCREATORBUG-11179 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-04-151-6/+0
|\ | | | | | | | | | | | | | | Conflicts: src/libs/timeline/qml/MainView.qml src/plugins/git/gitclient.cpp Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
| * Fix plugin error dialog modalityOrgad Shaneh2015-04-141-6/+0
| | | | | | | | | | | | | | | | | | | | When the dialog is displayed, the welcome mode becomes disabled. This happens because before the main loop begins, there is no active window, so the dialog has no parent to return focus to when it is closed. Change-Id: I2f8830c3c7bc6816d8483e05e81f5abfe5ee335f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Close with error if Core plugin is found but disabledEike Ziller2015-04-011-0/+5
|/ | | | | | | Change-Id: I9ec0f970da99ce7cdf171684b41fafa4b38a2629 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Introduce convenience project property sharedSourcesDir.Christian Kandeler2015-02-181-2/+2
| | | | | Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-123-15/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-15/+15
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | qbs build: Derive QtCreator app from QtcProduct.Christian Kandeler2015-01-291-7/+2
| | | | | | | | | | | | | | | | So we inherit e.g. the cpp flags defined there. (Currently, compilation fails because cxxLanguageVersion is not set for this product.) Change-Id: Id66f2f6cdc7ba2155c820fd9aa77bb6ea9ecf0b7 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Replace QFileInfo::fileName() with FileName::fileName()Orgad Shaneh2015-01-291-1/+2
| | | | | | | | | | Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d Reviewed-by: hjk <hjk@theqtcompany.com>
* | Plugin Tests: Create settings dir with QTemporaryDirNikolai Kosjar2014-12-181-3/+8
| | | | | | | | | | | | | | | | Create a clean and unique settings directory for "-test" runs if no settings path is provided explicitly. Change-Id: Ida2f5a74d42a5292963dd8d5d1f9dcddcdd24fd4 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Use systemProxyForQuery() everywhereKai Koehne2014-12-051-13/+1
|/ | | | | | | | | | | | | For generic Unix, Qt automatically picks up http_proxy since Qt 4.8 (commit 2ec929a2b). It also picks up e.g. https_proxy etc, so it's better to rely on it. On OS X we want to use the system proxy settings, that allow also more advanced configuration like different proxies for different services, passwords ... Change-Id: I72de5e576e4d34d87f4c787bb597db0ca59a70e1 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Updated Qt Creator application logosAlessandro Portale2014-11-192-0/+0
| | | | | | | | | The leaf does not have a white border, anymore. The .ico and .icns files now have a shadow. Task-number: QTCREATORBUG-13359 Change-Id: Iebdc6aefb36592333f1d76cd28a407a121318bb6 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* adding 24px-size to qtcreator.icoAlessandro Portale2014-11-061-0/+0
| | | | | Change-Id: Ic5e6b861e0c66e5a1f1a4e081c76b436a669c622 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Updated Qt Creator iconAlessandro Portale2014-11-062-0/+0
| | | | | Change-Id: Ib95510a3c9b6e15ae9956181c3462bb8251df61a Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Remove workaround for Qt bug that was resolved in 5.1.1Orgad Shaneh2014-11-061-4/+0
| | | | | | | QTBUG-31569 Change-Id: I33ffc505a9a26f5cd338d7768f5f854ef3cccaca Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* OS X: Add system requirement OS X 10.7 to Info.plistEike Ziller2014-11-031-0/+2
| | | | | | | | | | Since 10.6 is no longer supported (C++11). With the explicit system requirement, the user gets a nice message about minimum system requirements, instead of a comment-less crash at startup. Change-Id: I909796ce8c5a303162b7a778311b95ed06a28108 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-142-14/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14/+16
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | New Qt Creator logoAlessandro Portale2014-10-091-0/+0
| | | | | | | | | | Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-1/+1
| | | | | | | | | | | | | | it's the correct variable to use. Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Remove Qt version checks.Christian Kandeler2014-09-081-11/+0
| | | | | | | | | | | | | | | | Qt 5.3 is the minimum requirement these days. Remove all fallback code from sources and project files. Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-3/+3
| | | | | | | | | | | | | | | | 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>
* | Do not use deprecated Qt functionality.Christian Kandeler2014-08-291-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Remove logging wrapper code for Qt 4 compatibilityhjk2014-08-271-1/+1
| | | | | | | | | | Change-Id: I95ed943638895b718862f05e3f706dcbef4c6a7d Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Use Qt 5's QStringList::join(QChar)hjk2014-08-251-1/+1
|/ | | | | | | Less typing and less cycles than join(QString) where appropriate Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qbs: Avoid some warningsJoerg Bornemann2014-07-231-1/+1
| | | | | Change-Id: Id308bdcc916f7bdf931e45b0f02ea0b1ebe12320 Reviewed-by: hjk <hjk121@nokiamail.com>
* Mark app.pro as QTC_RUNNABLEDaniel Teske2014-07-081-0/+1
| | | | | Change-Id: I8549e00a6360504fad2a93e3b862ecc8cd909c2a Reviewed-by: Eike Ziller <eike.ziller@digia.com>