[Cmake-commits] CMake branch, master, updated. v3.12.1-562-gb0f769a

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b0f769ad2da5162f7f65e13061b18b4538f06d9a (commit)
       via  182522a209331cd1d221420972ed6b200918f6e6 (commit)
       via  b6524f6f3425aaffc1e5fa2f6d3f5847ed3f94f5 (commit)
       via  925b95fbadae0fe59f38b744dfb0f665436d8d11 (commit)
       via  0b82e68f2f52847e4c14f1b22e6ef537b42f415a (commit)
       via  13a2751ca6e45789631bf2457d6bc519926441cc (commit)
       via  6be7097dbe7373e78d5a3fe054895443f962aa0a (commit)
      from  cb800ebb83646ef4ef2b2e2950d90837bc5c14a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0f769ad2da5162f7f65e13061b18b4538f06d9a
commit b0f769ad2da5162f7f65e13061b18b4538f06d9a
Merge: 182522a 13a2751
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 5 18:40:20 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 5 14:40:26 2018 -0400

    Merge topic 'cmake-gui-align-text'
    
    13a2751ca6 cmake-gui: Align source and binary directory path text
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2344


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=182522a209331cd1d221420972ed6b200918f6e6
commit 182522a209331cd1d221420972ed6b200918f6e6
Merge: b6524f6 925b95f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 5 14:36:47 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 5 14:36:47 2018 -0400

    Merge branch 'release-3.12'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6524f6f3425aaffc1e5fa2f6d3f5847ed3f94f5
commit b6524f6f3425aaffc1e5fa2f6d3f5847ed3f94f5
Merge: cb800eb 0b82e68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 5 18:35:41 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 5 14:35:46 2018 -0400

    Merge topic 'vs-CMakeLists.txt'
    
    0b82e68f2f VS: Restore CMakeLists.txt references in each target
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2349


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13a2751ca6e45789631bf2457d6bc519926441cc
commit 13a2751ca6e45789631bf2457d6bc519926441cc
Author:     Zeex <zeex at rocketmail.com>
AuthorDate: Tue Sep 4 16:41:28 2018 +0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 4 13:01:00 2018 -0400

    cmake-gui: Align source and binary directory path text
    
    Text inputs for "where is the source code" and "where to build the
    binaries" had different amount of left spacing, so the two paths were
    not aligned. This could create a feeling that you typed something wrong
    in the input even though the paths were identical or had a common root
    path.

diff --git a/Source/QtDialog/CMakeSetupDialog.ui b/Source/QtDialog/CMakeSetupDialog.ui
index 8d8e0cd..dc22a29 100644
--- a/Source/QtDialog/CMakeSetupDialog.ui
+++ b/Source/QtDialog/CMakeSetupDialog.ui
@@ -57,6 +57,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="styleSheet">
+        <string notr="true">padding-left: 0</string>
+       </property>
        <property name="editable">
         <bool>true</bool>
        </property>

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.ui        | 3 +++
 Source/cmVisualStudio10TargetGenerator.cxx | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake