Commits · 2163e7b38fd56c058e664c8a09ccc14733dbc1b1 · Kirill Smelkov / linux

14 Oct, 2015 40 commits

kconfig/merge_config.sh: Accept a single file · 2163e7b3

Gabriel de Perthuis authored Oct 14, 2015

merge_config.sh can usefully be applied to a single file.
It implicitly merges with the default configuration.
Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

2163e7b3

kconfig/merge_config.sh: Support KCONFIG_CONFIG · ed94fea5

Gabriel de Perthuis authored Oct 14, 2015

All make targets support $KCONFIG_CONFIG because they
run scripts/kconf.  Make sure merge_config.sh accesses the
correct file in all cases.

Previously this script broke in two different code paths,
one for targets like kvmconfig (which use merge_config.sh -m
then call a target that respects KCONFIG_CONFIG) and one for
direct use of the script without -m, which called make rules
that edit KCONFIG_CONFIG but verified a different file.
Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

ed94fea5

Update the buildsystem for KConfig finding Qt · d1b0dc90

Thiago Macieira authored Sep 22, 2015

The buildsystem will now only search for Qt 4 and Qt 5. Support for Qt 2
and 3 was dropped in the previous commits (Qt 3 was EOL'ed in 2010 or
so...).

For Qt 5, to be future-proof with the future direction notice appearing
in the 5.5 release, C++11 support is automatically enabled.
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

d1b0dc90

Port xconfig to Qt5 - Update copyright. · b4ff1de3

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

b4ff1de3

Port xconfig to Qt5 - Fix goParent issue. · ee7298fb

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

ee7298fb

Port xconfig to Qt5 - on Back clicked, deselect old item. · 5df9da9d

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

5df9da9d

Port xconfig to Qt5 - Add(back) one click checkbox toggle. · 76d53cbb

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

76d53cbb

Port xconfig to Qt5 - Add(back) lineedit editing. · e336b9f1

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

e336b9f1

Port xconfig to Qt5 - Remove some commented code. · 5c60014b

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

5c60014b

Port xconfig to Qt5 - Source format. · b3c48f96

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

b3c48f96

Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel. · f999cc06

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

f999cc06

Port xconfig to Qt5 - Change ConfigItem constructor parent type. · d960b988

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

d960b988

Port xconfig to Qt5 - Disable ConfigList soring · a5225e9b

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

a5225e9b

Port xconfig to Qt5 - Remove ConfigList::updateMenuList template. · 5c6f1554

Boris Barbulovski authored Sep 22, 2015

ConfigItem executes parent->takeChild(0)

while

ConfigList executes parent->takeTopLevelItem(0)
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

5c6f1554

Port xconfig to Qt5 - Add ConfigList::mode to initializer list. · dbf62933

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

dbf62933

Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list. · 86c05282

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

86c05282

Port xconfig to Qt5 - Tree widget set column titles. · a52cb321

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

a52cb321

Port xconfig to Qt5 - Quick workaround to bypass app crash at startup. · e484fe3a

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

e484fe3a

Port xconfig to Qt5 - Set ConfigView object name. · 9bd36ed3

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

9bd36ed3

Port xconfig to Qt5 - Use correct signal names. · c14fa5e1

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

c14fa5e1

Port xconfig to Qt5 - Remove Qt3Support from Makefile. · 9bfda0ab

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

9bfda0ab

Port xconfig to Qt5 - Put back some of the old implementation(part 2). · d5d973c3

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

d5d973c3

Port xconfig to Qt5 - Put back some of the old implementation. · 59e56440

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

59e56440

Port xconfig to Qt5 - Introduce Qt4/5 version of ConfigList and ConfigItem · 1019f1a5

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

1019f1a5

Port xconfig to Qt5 - update signals · 92119937

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

92119937

Port xconfig to Qt5 - Fix the code so it compiles with Qt5 · 68ccb7ef

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

68ccb7ef

Port xconfig to Qt5 - Remove custom ListView classes. · 76538660

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

76538660

Port xconfig to Qt5 - Make single/split/full actions checkable. · 780505e3

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

780505e3

Port xconfig to Qt5 - Update QAction checkable · 9c86235a

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

9c86235a

Port xconfig to Qt5 - Fix layout margin. · 92298b49

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

92298b49

Port xconfig to Qt5 - Fix layout · 29a70168

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

29a70168

Port xconfig to Qt5 - Replace Q3VBox with QWidget · 34d6320b

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

34d6320b

Port xconfig to Qt5 - Remove unused #include <q3dragobject.h> · 1ce67353

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

1ce67353

Port xconfig to Qt5 - Use QMenu · 76bede87

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

76bede87

Port xconfig to Qt5 - Use QTextBrowser · 924bbb53

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

924bbb53

Port xconfig to Qt5 - Use QList · 041fbdc2

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

041fbdc2

Port xconfig to Qt5 - Use QFileDialog · bea00771

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

bea00771

Port xconfig to Qt5 - Use QAction · 85eaf28a

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

85eaf28a

Port xconfig to Qt5 - Use QMainWindow, QToolBar · b1f8a45b

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

b1f8a45b

Remove support for QT3 and older. · 8328447a

Boris Barbulovski authored Sep 22, 2015

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

8328447a