diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /examples/sql/drilldown/informationwindow.h | |
parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'examples/sql/drilldown/informationwindow.h')
-rw-r--r-- | examples/sql/drilldown/informationwindow.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/sql/drilldown/informationwindow.h b/examples/sql/drilldown/informationwindow.h index e1bb9bc958..f039e120ca 100644 --- a/examples/sql/drilldown/informationwindow.h +++ b/examples/sql/drilldown/informationwindow.h @@ -50,7 +50,7 @@ class InformationWindow : public QDialog Q_OBJECT public: - InformationWindow(int id, QSqlRelationalTableModel *offices, + InformationWindow(int id, QSqlRelationalTableModel *items, QWidget *parent = 0); int id(); @@ -70,12 +70,11 @@ private slots: private: void createButtons(); - int locationId; + int itemId; QString displayedImage; QComboBox *imageFileEditor; - QLabel *locationText; - QLabel *countryText; + QLabel *itemText; QTextEdit *descriptionEditor; QPushButton *closeButton; |