Commit c71b155b authored by David Faure's avatar David Faure
Browse files

Merge branch 'release/20.04'

parents 3f1a233e bebc1972
......@@ -111,8 +111,6 @@ target_link_libraries(kdeinit_konqueror
KF5::WindowSystem
)
target_link_libraries(kdeinit_konqueror KF5::KDELibs4Support)
if (X11_FOUND)
target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
endif ()
......
......@@ -89,16 +89,21 @@ static KonqMainWindow* handleCommandLine(QCommandLineParser &parser, const QStri
}
}
const bool firstStart = !KonqMainWindow::mainWindowList();
// Ask the user to recover session if applicable
KonqSessionManager::self()->askUserToRestoreAutosavedAbandonedSessions();
if (args.isEmpty()) {
// No args. If --silent, do nothing, otherwise create a default window.
if (!parser.isSet("silent")) {
// If session recovery created some windows, no need for an empty window here.
QList<KonqMainWindow *> *mainWindowList = KonqMainWindow::mainWindowList();
if (mainWindowList && !mainWindowList->isEmpty()) {
return mainWindowList->at(0);
// #388333
if (firstStart) {
// If session recovery created some windows, no need for an empty window here.
QList<KonqMainWindow *> *mainWindowList = KonqMainWindow::mainWindowList();
if (mainWindowList && !mainWindowList->isEmpty()) {
return mainWindowList->at(0);
}
}
KonqMainWindow *mainWin = KonqMainWindowFactory::createNewWindow();
......@@ -257,7 +262,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
KWindowSystem::forceActiveWindow(mainWindow->winId());
}
});
fixOldStartUrl();
if (app.isSessionRestored()) {
......
......@@ -23,6 +23,7 @@
#define KTABWIDGET_H
#include <QTabWidget>
#include <konqprivate_export.h>
class QTab;
......@@ -33,7 +34,7 @@ class QTab;
*
* See also the QTabWidget documentation.
*/
class KTabWidget : public QTabWidget
class KONQ_TESTS_EXPORT KTabWidget : public QTabWidget
{
Q_OBJECT
Q_PROPERTY(bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs)
......@@ -172,4 +173,4 @@ private:
Q_PRIVATE_SLOT(d, void slotTabMoved(int, int))
};
#endif
\ No newline at end of file
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment