projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[firefly-linux-kernel-4.4.55.git]
/
scripts
/
kconfig
/
qconf.h
diff --git
a/scripts/kconfig/qconf.h
b/scripts/kconfig/qconf.h
index 6fc1c5f14425162aab07eb5e35f8d24f0c8ccadc..b3b5657b6b35423c003bf40aff66cc047e894d22 100644
(file)
--- a/
scripts/kconfig/qconf.h
+++ b/
scripts/kconfig/qconf.h
@@
-279,7
+279,7
@@
class ConfigSearchWindow : public QDialog {
Q_OBJECT
typedef class QDialog Parent;
public:
- ConfigSearchWindow(
QWidget
* parent, const char *name = 0);
+ ConfigSearchWindow(
ConfigMainWindow
* parent, const char *name = 0);
public slots:
void saveSettings(void);