Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all
Unified · Split
| @@ -225,8 +225,8 @@ · 224 unmodified lines | ||
| 225 | 225 | #ifdef DEBUG_EVENT_QUEUE |
| 226 | 226 | // This is a HACK that uses private headers included with the qt source distrubution. |
| 227 | 227 | // To use this feature you need to add these directores to your include path: |
| 228 | −// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1/QtCore | |
| 229 | −// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1 | |
| 228 | +// E:/Qt/5.10.1/Src/qtbase/include/QtCore/5.10.1/QtCore | |
| 229 | +// E:/Qt/5.10.1/Src/qtbase/include/QtCore/5.10.1 | |
| 230 | 230 | #define QT_BOOTSTRAPPED |
| 231 | 231 | #include <private/qthread_p.h> |
| 232 | 232 | #include <private/qobject_p.h> |
| @@ -2038,7 +2038,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1805 unmodified lines | ||
| 2038 | 2038 | }); |
| 2039 | 2039 | |
| 2040 | 2040 | _snapshotSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/snap.wav")); |
| 2041 | − | |
| 2041 | + | |
| 2042 | 2042 | QVariant testProperty = property(hifi::properties::TEST); |
| 2043 | 2043 | qDebug() << testProperty; |
| 2044 | 2044 | if (testProperty.isValid()) { |
| @@ -6590,7 +6590,7 @@ void Application::addAssetToWorldFromURL(QString url) { · 4545 unmodified lines | ||
| 6590 | 6590 | } else { |
| 6591 | 6591 | filename.remove(".zip"); |
| 6592 | 6592 | } |
| 6593 | − | |
| 6593 | + | |
| 6594 | 6594 | } |
| 6595 | 6595 | |
| 6596 | 6596 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { |
| @@ -6764,7 +6764,7 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q · 167 unmodified lines | ||
| 6764 | 6764 | addAssetToWorldError(filenameFromPath(filePath), errorInfo); |
| 6765 | 6765 | } else { |
| 6766 | 6766 | // to prevent files that aren't models or texture files from being loaded into world automatically |
| 6767 | − if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || | |
| 6767 | + if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || | |
| 6768 | 6768 | ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) && |
| 6769 | 6769 | ((!isBlocks) && (!isZip)))) { |
| 6770 | 6770 | addAssetToWorldAddEntity(filePath, mapping); |
| @@ -7413,8 +7413,8 @@ bool Application::isThrottleRendering() const { · 642 unmodified lines | ||
| 7413 | 7413 | bool Application::hasFocus() const { |
| 7414 | 7414 | bool result = (QApplication::activeWindow() != nullptr); |
| 7415 | 7415 | #if defined(Q_OS_WIN) |
| 7416 | − // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't | |
| 7417 | − // take user focus away from their current window. So also check whether the application is the user's current foreground | |
| 7416 | + // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't | |
| 7417 | + // take user focus away from their current window. So also check whether the application is the user's current foreground | |
| 7418 | 7418 | // window. |
| 7419 | 7419 | result = result && (HWND)QApplication::activeWindow()->winId() == GetForegroundWindow(); |
| 7420 | 7420 | #endif |
| @@ -7422,7 +7422,7 @@ bool Application::hasFocus() const { · 1 unmodified line | ||
| 7422 | 7422 | } |
| 7423 | 7423 | |
| 7424 | 7424 | void Application::setFocus() { |
| 7425 | − // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and | |
| 7425 | + // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and | |
| 7426 | 7426 | // flashes the taskbar icon. |
| 7427 | 7427 | auto window = qApp->getWindow(); |
| 7428 | 7428 | window->activateWindow(); |
| @@ -7663,7 +7663,7 @@ void Application::updateDisplayMode() { · 234 unmodified lines | ||
| 7663 | 7663 | menu->setIsOptionChecked(MenuOption::FirstPerson, true); |
| 7664 | 7664 | cameraMenuChanged(); |
| 7665 | 7665 | } |
| 7666 | − | |
| 7666 | + | |
| 7667 | 7667 | // Remove the mirror camera option from menu if in HMD mode |
| 7668 | 7668 | auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror); |
| 7669 | 7669 | mirrorAction->setVisible(!isHmd); |