diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-29 12:40:16 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-29 23:13:43 +0000 |
| commit | 36615661d5b0bacef519a64a3cc24cf9d4270117 (patch) | |
| tree | fc931ba9bdac724d78fa8bd1f131bf980dcd403f /ui/qt/main_window.h | |
| parent | 41ba1d79957ddcc6c8c2d59bb416fd5d722f79d5 (diff) | |
| download | wireshark-36615661d5b0bacef519a64a3cc24cf9d4270117.tar.gz | |
Fix compile problems on OS X.
Apparently, the C++ compilers on the OS X buildbots don't realize that a
reference cannot be null and therefore that there's nothing ambiguous
about QString(NULL) - the NULL must be a "const char *". Instead, use a
constructed null QString.
Change-Id: Ibc56ea7f84c5e49cf3b1974c3de905bf23e90ff0
Reviewed-on: https://code.wireshark.org/review/12928
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 6a2032e256..f7ffcfbabe 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -237,7 +237,7 @@ public slots: void updatePreferenceActions(); void updateRecentActions(); - void setWSWindowTitle(QString title = NULL); + void setWSWindowTitle(QString title = QString()); void captureCapturePrepared(capture_session *); void captureCaptureUpdateStarted(capture_session *); |