1. 14 Oct, 2014 9 commits
    • Eike Ziller's avatar
      Merge remote-tracking branch 'origin/3.2' · ea271432
      Eike Ziller authored
      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
      ea271432
    • Robert Loehning's avatar
      Squish: Update object for tst_modify_readonly · e2456cf8
      Robert Loehning authored
      Change-Id: I45814f0e7d7e719c4ea73de658e44bd0e7c17d9a
      Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
      e2456cf8
    • Ulf Hermann's avatar
      QmlProfiler: Increase minimum size of timeline items to 3px · 10a14ced
      Ulf Hermann authored
      One pixel wide lines are too hard to spot.
      
      Change-Id: I94f71ba4305078d8682673618be0f5a5e1f85ba8
      Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
      10a14ced
    • Ulf Hermann's avatar
      QmlProfiler: Pass input events with the same signal as all others · 8e7a95f0
      Ulf Hermann authored
      Change-Id: I1d2e4da0ffe4772acff95ec27d5459309d41aa60
      Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
      8e7a95f0
    • Fawzi Mohamed's avatar
      Add ui.qml support to code mode and editor · 419d4e44
      Fawzi Mohamed authored
      Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
      Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
      419d4e44
    • Alessandro Portale's avatar
      WelcomeScreen: Fix font differences in "Projects" tab · 65aef999
      Alessandro Portale authored
      Task-number: QTCREATORBUG-13165
      Change-Id: I6ee42792e374d2a80c24871421bcf99ebecab719
      Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
      65aef999
    • Thomas Hartmann's avatar
      Manual tests for UI split · 5847f325
      Thomas Hartmann authored
      This adds a couple of projects for testing the ui split.
      
      Change-Id: I9056702e724541a43895f28453ce31516a348e70
      Reviewed-by: default avatarAlessandro Portale <alessandro.portale@digia.com>
      5847f325
    • Alessandro Portale's avatar
      Update URL to the Qt Account page · 087d1f5c
      Alessandro Portale authored
      It moved to https://account.qt.io
      
      Change-Id: I54df8eb37d06d2ab5f4d6c3bb489fbdd7d3e5229
      Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
      087d1f5c
    • Christian Stenger's avatar
      Squish: Don't use deprecated function when having a Qt5 build · ebf03a5f
      Christian Stenger authored
      Change-Id: I8717bda9c4a24effe36a80e689829e93539186c6
      Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
      ebf03a5f
  2. 13 Oct, 2014 20 commits
  3. 12 Oct, 2014 1 commit
  4. 10 Oct, 2014 10 commits