1. 22 Jul, 2014 11 commits
    • hjk's avatar
      AndroidManager: Move private static functions to implementation · 1768d20b
      hjk authored
      
      
      Change-Id: I245af5cc77360aa70838153e0fd8eb15ffe659d8
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      1768d20b
    • hjk's avatar
      Bazaar: Code style · 2bf4d7c3
      hjk authored
      
      
      Change-Id: I0c2281703d4708bf07702d9d2fc148842489bb04
      Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
      2bf4d7c3
    • Eike Ziller's avatar
      EditorManager: Do not be a widget. · 4b828173
      Eike Ziller authored
      
      
      There is no reason for the editor manager itself to be a widget. This
      makes even less sense in the presence of multiple windows.
      
      Change-Id: I384f8945fdd5632d64643e473e6637e05abbce7e
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      4b828173
    • BogDan Vatra's avatar
      Use debug deployment method by default. · 30bad4b3
      BogDan Vatra authored
      
      
      Alongside with Ministro is by far the fastest deployment method.
      
      Change-Id: I02de831d312d60c50762e8130ccffefcf1f36843
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      30bad4b3
    • BogDan Vatra's avatar
      Disable signing when using debug deployment method. · d50e15f6
      BogDan Vatra authored
      
      
      The debug deployment method can't be used to create APKs that can be
      published on Android markets.
      
      Change-Id: I0539e1e7bcbf5935d74f9ee93cadc8b296a94664
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      d50e15f6
    • hjk's avatar
      Android: Compile fix for namespaced Qt · 9f4322a3
      hjk authored
      
      
      Change-Id: Iaf09e3528a6aceabe631aa7b53441ea940cc645b
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      9f4322a3
    • Alessandro Portale's avatar
      FakeVim: Remove excess frame from Mapping options page · 9e2512da
      Alessandro Portale authored
      
      
      The outer widget was a QGroupBox without a label. That results in a
      frame/border. This patch changes it to a QWidget.
      
      Change-Id: I30fc674818d1983563d385bf06decc1b089aed4c
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      9e2512da
    • hjk's avatar
      Remove ITextMarkable · cd7df865
      hjk authored
      
      
      There was only a single user (TextEditor::DocumentMarker) which
      in turn was only used in a single place (BaseTextDocument), so
      merge the ITextMarkable into BaseTextDocument.
      
      Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7
      Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
      cd7df865
    • Friedemann Kleint's avatar
      Fix compilation with MSVC2013. · 19a44fd7
      Friedemann Kleint authored
      
      
      src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(54) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::displayNameForId': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::displayNameForId', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
              ..\..\plugins\projectexplorer/runconfiguration.h(222) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::displayNameForId'
      src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(57) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::canCreate': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::canCreate', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
              ..\..\plugins\projectexplorer/runconfiguration.h(224) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::canCreate'
      src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(70) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::doCreate': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::doCreate', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
              ..\..\plugins\projectexplorer/runconfiguration.h(239) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::doCreate'
      .\qmakeandroidrunfactories.cpp(135) : fatal error C1021: invalid preprocessor command 'warning'
      
      Change-Id: Ie20cecf18ac393bc014f5b2ddcf7fea527b8ca0d
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      19a44fd7
    • BogDan Vatra's avatar
      Fix message · 03ee5dc4
      BogDan Vatra authored
      
      
      Change-Id: Iec98cc61854d690f0fa0f4b19978dc16ede2db48
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      03ee5dc4
    • BogDan Vatra's avatar
      Fix qbs compile · ea0c16aa
      BogDan Vatra authored
      
      
      Change-Id: Ic8e6072807f2aee3bc3597601e21a1132ab04eea
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      ea0c16aa
  2. 21 Jul, 2014 21 commits
  3. 18 Jul, 2014 8 commits